[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[820] fvwm/components/functions

[<dom...@us...>]

Revision: 820
          http://sourceforge.net/p/fvwm-crystal/code/820
Author:   dominique_libre
Date:     2015-12-26 18:46:42 +0000 (Sat, 26 Dec 2015)
Log Message:
-----------
a few minor fixes for the mixer

Modified Paths:
--------------
    ChangeLog
    fvwm/components/functions/Mixer

Modified: ChangeLog
===================================================================
--- ChangeLog	2015-12-26 17:12:29 UTC (rev 819)
+++ ChangeLog	2015-12-26 18:46:42 UTC (rev 820)
@@ -12,6 +12,9 @@
   functions/Mixer, functions/Preferences-Menu: amixer volume control can recognize now
   all the controls with "Volume" in their names, as shown by 
     'amixer -c <n> controls | grep Volume'.
+  functions/Mixer: fix aumix vol control when no pcm and master; load amixer current
+  volume only when amixer is selected; add the mixer name in the menu when different
+  from amixer.
 
 mercredi 23 décembre 2015
   functions/Preferences-Menu: fix DesktopIcons helper script shut down.

Modified: fvwm/components/functions/Mixer
===================================================================
--- fvwm/components/functions/Mixer	2015-12-26 17:12:29 UTC (rev 819)
+++ fvwm/components/functions/Mixer	2015-12-26 18:46:42 UTC (rev 820)
@@ -48,7 +48,7 @@
 # Initialisations {{{1
 # aumix {{{2
 # Set VolControl: Test if MASTER mixer exist, fallback to PCM
-PipeRead "if [ $[infostore.Mixer] = aumix ] ; then NVolControl=`aumix -d /dev/mixer$[infostore.SoundCard] -q | grep master -c` ; echo InfoStoreAdd VolControl `if [ $NVolControl = 0 ]; then echo w; else echo v ; fi` ; fi"
+PipeRead "if [ $[infostore.Mixer] = aumix ] ; then NVolControl=`aumix -d /dev/mixer$[infostore.SoundCard] -q | grep \'master\\|vol\' -c` ; echo InfoStoreAdd VolControl `if [ $NVolControl = 0 ]; then echo w; else echo v ; fi` ; fi"
 
 # amixer: Memorize the volume {{{2
 DestroyFunc AmixerCurrentVolume
@@ -56,7 +56,8 @@
 + I PipeRead 'if [ $[infostore.Mixer] = amixer ] ; then \\
 	echo "InfoStoreAdd CurrentVolume `amixer -c $[infostore.SoundCard] cget numid=$[infostore.SoundDevice] | grep \": values\" | sed -e \"s:.*values=::\" -e \"s:,.*::\"`"; \\
 	fi'
-AmixerCurrentVolume
+PipeRead 'if [ $[infostore.Mixer] = amixer ] ; then \\
+	echo AmixerCurrentVolume; fi'
 
 # Mute = off {{{2
 InfoStoreAdd MixerMute 0
@@ -194,7 +195,8 @@
 + '' Nop
 PipeRead 'if [ $[infostore.Mixer] = amixer ] ; \\
 	then $[FVWM_SYSTEMDIR]/scripts/AmixerControl $[infostore.SoundCard] $[infostore.SoundDevice]; \\
-	else for i in 0 -3 -6 -9 -12 -15 -18 -24 -30 -36 -42 -48 -54 -60 -100 ; \\
+	else echo \"+ \\\"$[infostore.Mixer]\\\" Nop\"; \\
+	    for i in 0 -3 -6 -9 -12 -15 -18 -24 -30 -36 -42 -48 -54 -60 -100 ; \\
 	    do		case $i in \\
 				0)	vol=100;; \\
 				-3)	vol=95;; \\

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.