.fvwmrc: Refactor many SetVolumeAndBrowser functions into one with parameters

diff --git a/.fvwm/main.m4 b/.fvwm/main.m4
index eee421a8fa526cbdbd09d56b1ce23f13794bea6d..0d1aec262f062cc477dffc185c8f14590e1c504b 100644 (file)
--- a/.fvwm/main.m4
+++ b/.fvwm/main.m4
@@ -664,25 +664,10 @@ AddToFunc KeePassXC           I Any ("*KeePassXC") Break
 +                             I Exec QT_SCALE_FACTOR=1.5 exec cgmem_nice 300 "$HOME"/tmp/KeePassXC-2.7.*-x86_64.AppImage
 +                             I Wait KeePassXC
 
 +                             I Exec QT_SCALE_FACTOR=1.5 exec cgmem_nice 300 "$HOME"/tmp/KeePassXC-2.7.*-x86_64.AppImage
 +                             I Wait KeePassXC
 

-DestroyFunc SetSilentVolumeAndBrowser
-AddToFunc SetSilentVolumeAndBrowser
-+                             I Exec exec "$HOME"/current/projects/audio-cdr-video/audio/pa-volume set 6554
-+                             I ResumeFireFox
-
-DestroyFunc SetLowVolumeAndBrowser
-AddToFunc SetLowVolumeAndBrowser
-+                             I Exec exec "$HOME"/current/projects/audio-cdr-video/audio/pa-volume set 20972
-+                             I ResumeFireFox
-
-DestroyFunc SetNormalVolumeAndBrowser
-AddToFunc SetNormalVolumeAndBrowser
-+                             I Exec exec "$HOME"/current/projects/audio-cdr-video/audio/pa-volume set 26214
-+                             I ResumeFireFox
-
-DestroyFunc SetLoudVolumeAndBrowser
-AddToFunc SetLoudVolumeAndBrowser
-+                             I Exec exec "$HOME"/current/projects/audio-cdr-video/audio/pa-volume set 52429
-+                             I SuspendFireFox
+DestroyFunc SetVolumeAndBrowser
+AddToFunc SetVolumeAndBrowser
++                             I Exec exec "$HOME"/current/projects/audio-cdr-video/audio/pa-volume set $0
++                             I PipeRead "echo $[1]Firefox"

 
 ##############################################################################
 # MENU Setup
 
 ##############################################################################
 # MENU Setup


@@ -869,10 +854,12 @@ AddToMenu Utilities     "Choose one:" Title
 
 DestroyMenu Volume
 AddToMenu Volume        "Choose one:" Title
 
 DestroyMenu Volume
 AddToMenu Volume        "Choose one:" Title

-+                       "Silent (10%)" SetSilentVolumeAndBrowser
-+                       "Low (32%)" SetLowVolumeAndBrowser
-+                       "Normal (40%)" SetNormalVolumeAndBrowser
-+                       "Loud (80%)" SetLoudVolumeAndBrowser
++                       "Silent (10%)" SetVolumeAndBrowser 6554 Resume
++                       "Quiet (32%)" SetVolumeAndBrowser 20972 Resume
++                       "Low (40%)" SetVolumeAndBrowser 26214 Resume
++                       "Normal (52%)" SetVolumeAndBrowser 34078 Resume
++                       "Loud (60%)" SetVolumeAndBrowser 39322 Resume
++                       "Very loud (80%)" SetVolumeAndBrowser 52429 Suspend

 +                       "pavucontrol" PaVuControl
 
 DestroyMenu  Browsers
 +                       "pavucontrol" PaVuControl
 
 DestroyMenu  Browsers