Merge pull request #1403 from rern/camilladsp

Camilladsp
rern · Aug 28, 2023 · 923c5da · 923c5da
2 parents 5c98424 + 9fe8df2
commit 923c5da
Show file tree

Hide file tree

Showing 14 changed files with 253 additions and 98 deletions.
diff --git a/install.sh b/install.sh
@@ -4,7 +4,24 @@ alias=r1
 
 . /srv/http/bash/settings/addons.sh
 
-# 20230822
+# 20230828
+file=/etc/systemd/system/cmd-websocket.service
+if [[ ! -e $file ]]; then
+	pacman -S --noconfirm --needed python-websockets
+	echo "\
+[Unit]
+Description=Command websocket server
+After=startup.service
+
+[Service]
+ExecStart=/srv/http/bash/cmd-websocket.py
+
+[Install]
+WantedBy=multi-user.target" > $file
+	systemctl daemon-reload
+	systemctl enable --now cmd-websocket
+fi
+
 if [[ ! -e $dircamilladsp/configs-bt ]]; then
 	cat << EOF > /etc/default/camilladsp
 ADDRESS=0.0.0.0
@@ -32,15 +49,6 @@ mixersmax=10
 mixersmin=-10" > $dirsystem/camilla.conf
 fi
 
-# 20230630
-if ! grep -q sudo /etc/conf.d/devmon; then
-	sed -i 's|/srv|/usr/bin/sudo /srv|g' /etc/conf.d/devmon
-	systemctl restart devmon@http
-fi
-
-file=/etc/systemd/system/spotifyd.service
-grep -q CPUAffinity $file && sed -i '/CPUAffinity/ d' $file
-
 #-------------------------------------------------------------------------------
 installstart "$1"
 
@@ -54,18 +62,3 @@ cacheBust
 [[ -e $dirsystem/color ]] && $dirbash/cmd.sh color
 
 installfinish
-#-------------------------------------------------------------------------------
-
-# 20230623
-if [[ -e $dirmpd/album ]]; then
-	files=$( ls -1 $dirmpd | grep -Ev 'mpd.db|listing|updating' )
-	for f in $files; do
-		charlast=$( tail -c 1 $dirmpd/$f )
-		[[ $charlast ]] && echo >> $dirmpd/$f
-	done
-fi
-
-# 20230822
-[[ -e $dirsystem/camilladsp && ! -e $dirsystem/camillavolume ]] && $dirsettings/camilla.py save &> /dev/null
-
-$dirsettings/player-conf.sh
diff --git a/srv/http/assets/css/camilla.css b/srv/http/assets/css/camilla.css
@@ -177,7 +177,7 @@ input[ type=range ] {
 #divvolume .col-l {
 	padding-top: 6px;
 }
-#divvolume .i-mute {
+#divvolume .i-volume {
 	width: 40px;
 	margin-right: 8px;
 	line-height: 40px;
@@ -375,6 +375,39 @@ i.disabled,
 .helpmenu {
 	border-bottom: 1px solid var( --cga );
 }
+.slider {
+	position: relative;
+	display: inline-block;
+	width: 100%;
+	max-width: 230px;
+	height: 40px;
+}
+.slider .track {
+	position: absolute;
+	width: calc( 100% - 20px );
+	height: 4px;
+	top: 18px;
+	left: 10px;
+	border: 1px solid var( --cga );
+	background: linear-gradient( 90deg, transparent 10px, var( --cga ) 10px, var( --cga ) calc( 100% - 10px ), transparent 10px );
+}
+.slider .slide {
+	position: absolute;
+	width: calc( 100% - 40px );
+	height: 100%;
+	top: 0;
+	left: 20px;
+	z-index: 1;
+}
+.slider .thumb {
+	position: relative;
+	width: 40px;
+	height: 40px;
+	border-radius: 4px;
+	background: var( --glossy-btn );
+	background-color: var( --cm );
+	box-shadow: var( --shadow-btn );
+}
 @media (max-width: 700px) {
 	#mixers .i-inverted { display: none }
 }

diff --git a/srv/http/assets/css/common.css b/srv/http/assets/css/common.css
@@ -10,7 +10,7 @@
 
 @font-face {
 	font-family : rern;
-	src         : url( '/assets/fonts/rern.woff2?v=1691584116' );
+	src         : url( '/assets/fonts/rern.woff2?v=1691584117' );
 }
 @font-face {
 	font-family : Lato;
@@ -218,6 +218,7 @@ i {
 .i-usbautoupdate::before   { content: '\F536' }
 .i-usbdrive::before        { content: '\F553' }
 .i-volume::before          { content: '\F516' }
+.i-volume.mute::before     { content: '\F517' }
 .i-vuled::before           { content: '\F57C' }
 .i-warning::before         { content: '\F562' }
 .i-webradio::before        { content: '\F55D' }

diff --git a/srv/http/assets/css/settings.css b/srv/http/assets/css/settings.css
@@ -696,6 +696,7 @@ input.disabled + .switchlabel:after {
 	.setting,
 	.settings,
 	.settingedit,
+	.slider,
 	.status:not(pre,.single),
 	.switchlabel,
 	.tab .i-add,