From: <dom...@us...> - 2019-08-14 04:14:24
|
Revision: 916 http://sourceforge.net/p/fvwm-crystal/code/916 Author: dominique_libre Date: 2019-08-14 04:14:19 +0000 (Wed, 14 Aug 2019) Log Message: ----------- Introduce Cadence support, add test for qjackctl Modified Paths: -------------- ChangeLog fvwm/components/functions/Media fvwm/components/functions/Music-alsaplayer fvwm/components/functions/Music-alsaplayerdaemon fvwm/components/functions/Music-audacious fvwm/components/functions/Music-cdcd fvwm/components/functions/Music-cmus fvwm/components/functions/Music-mocp fvwm/components/functions/Music-mpd fvwm/components/functions/Music-quodlibet fvwm/components/functions/Music-xmms2 Modified: ChangeLog =================================================================== --- ChangeLog 2019-08-13 17:38:31 UTC (rev 915) +++ ChangeLog 2019-08-14 04:14:19 UTC (rev 916) @@ -1,5 +1,9 @@ ChangeLog for FVWM-Crystal +mercredi 14 août 2019 + functions/Media, functions/Music-*: add Cadence support, fix qjackctl menu + when qjackctl is not installed, add Hide/Show GUI into all the buttonless menu. + mardi 13 août 2019 + ~japa~Japa in application database. desktop/HVWM-Crystal-Styles: append Generated--Applications-Icons-22-32 Modified: fvwm/components/functions/Media =================================================================== --- fvwm/components/functions/Media 2019-08-13 17:38:31 UTC (rev 915) +++ fvwm/components/functions/Media 2019-08-14 04:14:19 UTC (rev 916) @@ -103,11 +103,12 @@ + I AddToMenu /Player '%22x22/fvwm-crystal/audio-preferences-2.png%$[gt.Icons in file browser]' Popup /Preferences/MediaFileMenuIcons + I AddToMenu /Player "" Nop + I Test (X qjackctl) AddToMenu /Player '%22x22/apps/qjackctl.png%$[gt.Start QJackCtl]' Exec exec qjackctl ++ I Test (X cadence) AddToMenu /Player '%22x22/apps/cadence.png%$[gt.Start Cadence]' Exec cadence-session-start --maybe-system-start; cadence + I Test (X qjackctl) AddToMenu /Player "" Nop ++ I TestRc (NoMatch) Test (X cadence) AddToMenu /Player "" Nop + I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic-2.png%$[gt.Start player]' Popup /Music/Start + I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic-1.png%$[gt.Stop MPlayer]' Music-Kill + I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic-1.png%$[gt.Destroy MPlayer]' Music-Kill -9 -+ I AddToMenu /Player '$[gt.Show/Hide menu]' Music-GUI # Button menu (all) AddToMenu /Player @@ -464,7 +465,7 @@ + I AddToMenu /Music '$[gt.Playlists]' Popup /Playlist + I AddToMenu /Music '%22x22/fvwm-crystal/mixer-2.png%$[gt.Mixers]' Popup /Mixer + I AddToMenu /Music '$[gt.Speed]' Popup /Speed -+ I Test (X qjackctl) AddToMenu /Music '$[gt.Show/Hide QJackCtl]' Music-QJackGUI ++ I AddToMenu /Music '$[gt.Show/Hide Audio controls]' Music-QJackGUI # DVB channels Test (F /dev/dvb/adapter0/frontend0) + I AddToMenu /Music '$[gt.Channels] DVB 1' PopUp /Music/ChannelSet1 Test (F /dev/dvb/adapter1/frontend0) + I AddToMenu /Music '$[gt.Channels] DVB 2' PopUp /Music/ChannelSet2 Modified: fvwm/components/functions/Music-alsaplayer =================================================================== --- fvwm/components/functions/Music-alsaplayer 2019-08-13 17:38:31 UTC (rev 915) +++ fvwm/components/functions/Music-alsaplayer 2019-08-14 04:14:19 UTC (rev 916) @@ -1,5 +1,5 @@ # Support for Alsaplayer in Fvwm-Crystal -# Written by: Dominique Michel <dom...@us...> 2008-2013 +# Written by: Dominique Michel <dom...@us...> 2008-2019 # See ChangeLog for details # Initialisations, shared functions {{{1 @@ -31,11 +31,12 @@ + I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Recreate the Playlists]' Music-RecreatePlaylist + I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Music player]' Popup /Preferences/MusicPlayer + I AddToMenu /Player "" Nop -+ I AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl -+ I AddToMenu /Player "" Nop ++ I Test (X qjackctl) AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl ++ I Test (X cadence) AddToMenu /Player '$[gt.Start Cadence]' Exec cadence-session-start --maybe-system-start; cadence ++ I Test (X qjackctl) AddToMenu /Player "" Nop ++ I TestRc (NoMatch) Test (X cadence) AddToMenu /Player "" Nop + I AddToMenu /Player '$[gt.Start Alsaplayer]' Popup /Music/Start + I AddToMenu /Player '$[gt.Stop player]' Music-Kill -+ I AddToMenu /Player '$[gt.Show/Hide player]' Music-GUI # mouse 2 Music-GUI : allready here {{{2 # mouse 3 Music-QJackGUI : in Music @@ -270,7 +271,7 @@ + I AddToMenu /Music '$[gt.Player volume]' Popup /Music/Volume + I AddToMenu /Music '$[gt.Speed]' Popup /Speed + I AddToMenu /Music '$[gt.Playlists]' Popup /Playlist-button -+ I AddToMenu /Music '$[gt.Show/Hide QJackCtl]' Music-QJackGUI ++ I AddToMenu /Music '$[gt.Show/Hide Audio controls]' Music-QJackGUI # Tooltip {{{1 AddToFunc Tittle-Tooltip Modified: fvwm/components/functions/Music-alsaplayerdaemon =================================================================== --- fvwm/components/functions/Music-alsaplayerdaemon 2019-08-13 17:38:31 UTC (rev 915) +++ fvwm/components/functions/Music-alsaplayerdaemon 2019-08-14 04:14:19 UTC (rev 916) @@ -1,5 +1,5 @@ # Support for Alsaplayer in daemon mode for Fvwm-Crystal -# Written by: Dominique Michel <dom...@us...> 2015 +# Written by: Dominique Michel <dom...@us...> 2015-2019 # See ChangeLog for details # Initialisations, shared functions {{{1 @@ -32,11 +32,12 @@ + I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Recreate the Playlists]' Music-RecreatePlaylist + I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Music player]' Popup /Preferences/MusicPlayer + I AddToMenu /Player "" Nop -+ I AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl -+ I AddToMenu /Player "" Nop ++ I Test (X qjackctl) AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl ++ I Test (X cadence) AddToMenu /Player '$[gt.Start Cadence]' Exec cadence-session-start --maybe-system-start; cadence ++ I Test (X qjackctl) AddToMenu /Player "" Nop ++ I TestRc (NoMatch) Test (X cadence) AddToMenu /Player "" Nop + I AddToMenu /Player '$[gt.Start Alsaplayer daemon]' Popup /Music/Start + I AddToMenu /Player '$[gt.Stop player]' Music-Kill -+ I AddToMenu /Player '$[gt.Show/Hide player]' Music-GUI # mouse 2 Music-GUI : allready here {{{2 # mouse 3 Music-QJackGUI : in Music @@ -270,7 +271,7 @@ + I AddToMenu /Music '$[gt.Player volume]' Popup /Music/Volume + I AddToMenu /Music '$[gt.Speed]' Popup /Speed + I AddToMenu /Music '$[gt.Playlists]' Popup /Playlist-button -+ I AddToMenu /Music '$[gt.Show/Hide QJackCtl]' Music-QJackGUI ++ I AddToMenu /Music '$[gt.Show/Hide Audio controls]' Music-QJackGUI # Tooltip {{{1 AddToFunc Tittle-Tooltip Modified: fvwm/components/functions/Music-audacious =================================================================== --- fvwm/components/functions/Music-audacious 2019-08-13 17:38:31 UTC (rev 915) +++ fvwm/components/functions/Music-audacious 2019-08-14 04:14:19 UTC (rev 916) @@ -1,6 +1,6 @@ # Support for Audacious in Fvwm-Crystal # Written by: Rafael Antonio Porras Samaniego <sp...@di...> -# Modifications, debugging and improvments by Dominique Michel 2008-2013 +# Modifications, debugging and improvments by Dominique Michel 2008-2019 # <dom...@us...> # See ChangeLog for details @@ -18,11 +18,12 @@ + I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Recreate the Playlists]' Music-RecreatePlaylist + I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Music player]' Popup /Preferences/MusicPlayer + I AddToMenu /Player "" Nop -+ I AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl -+ I AddToMenu /Player "" Nop ++ I Test (X qjackctl) AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl ++ I Test (X cadence) AddToMenu /Player '$[gt.Start Cadence]' Exec cadence-session-start --maybe-system-start; cadence ++ I Test (X qjackctl) AddToMenu /Player "" Nop ++ I TestRc (NoMatch) Test (X cadence) AddToMenu /Player "" Nop + I AddToMenu /Player '$[gt.Start Audacious]' Exec exec audacious + I AddToMenu /Player '$[gt.Stop Audacious]' Exec exec audtool --shutdown -+ I AddToMenu /Player '$[gt.Show/Hide player]' Music-GUI # mouse 2 Music-GUI : allready here {{{2 # mouse 3 Music-QJackGUI : in Music @@ -162,7 +163,10 @@ + I AddToMenu /Music "" Nop + I AddToMenu /Music '$[gt.Stop playback]' Music-Stop + I AddToMenu /Music '$[gt.Show/Hide player]' Music-GUI ++ I AddToMenu /Music '$[gt.Show/Hide Audio controls]' Music-QJackGUI + I AddToMenu /Music '$[gt.Start Audacious]' Exec exec audacious ++ I Test (X qjackctl) AddToMenu /Music '$[gt.Start QJackCtl]' Exec exec qjackctl ++ I Test (X cadence) AddToMenu /Music '$[gt.Start Cadence]' Exec cadence-session-start --maybe-system-start; cadence + I AddToMenu /Music '$[gt.Stop Audacious]' Exec exec audtool --shutdown + I AddToMenu /Music '$[gt.Play/Pause]' Music-PlayPause + I AddToMenu /Music "" Nop Modified: fvwm/components/functions/Music-cdcd =================================================================== --- fvwm/components/functions/Music-cdcd 2019-08-13 17:38:31 UTC (rev 915) +++ fvwm/components/functions/Music-cdcd 2019-08-14 04:14:19 UTC (rev 916) @@ -2,7 +2,7 @@ # Written by: Maciej Delmanowski <ha...@po...> # sed commands by: Grzegorz Niewęgłowski <ho...@do...> # Modifications, debugging and improvments by Dominique Michel -# <dom...@us...> 2008-2013 +# <dom...@us...> 2008-2019 # See ChangeLog for details # Overview: @@ -28,11 +28,12 @@ + I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Recreate the Playlists]' Music-RecreatePlaylist + I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Music player]' Popup /Preferences/MusicPlayer + I AddToMenu /Player "" Nop -+ I AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl -+ I AddToMenu /Player "" Nop ++ I Test (X qjackctl) AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl ++ I Test (X cadence) AddToMenu /Player '$[gt.Start Cadence]' Exec cadence-session-start --maybe-system-start; cadence ++ I Test (X qjackctl) AddToMenu /Player "" Nop ++ I TestRc (NoMatch) Test (X cadence) AddToMenu /Player "" Nop + I AddToMenu /Player '$[gt.Stop playback]' Music-Stop + I AddToMenu /Player '$[gt.Play/Pause]' Music-PlayPause -+ I AddToMenu /Player '$[gt.Show/Hide player]' Music-GUI # mouse 2 Music-GUI : allready here {{{2 # mouse 3 Music-QJackGUI : in Music @@ -87,6 +88,9 @@ + I AddToMenu /Music "" Nop + I AddToMenu /Music '$[gt.Stop playback]' Music-Stop + I AddToMenu /Music '$[gt.Show/Hide player]' Music-GUI ++ I AddToMenu /Music '$[gt.Show/Hide Audio controls]' Music-QJackGUI ++ I Test (X qjackctl) AddToMenu /Music '$[gt.Start QJackCtl]' Exec exec qjackctl ++ I Test (X cadence) AddToMenu /Music '$[gt.Start Cadence]' Exec cadence-session-start --maybe-system-start; cadence + I AddToMenu /Music '$[gt.Play/Pause]' Music-PlayPause + I AddToMenu /Music "" Nop + I AddToMenu /Music '$[gt.Music player]' Popup /Preferences/MusicPlayer Modified: fvwm/components/functions/Music-cmus =================================================================== --- fvwm/components/functions/Music-cmus 2019-08-13 17:38:31 UTC (rev 915) +++ fvwm/components/functions/Music-cmus 2019-08-14 04:14:19 UTC (rev 916) @@ -1,7 +1,7 @@ # Support for C* Music Player # Written by: Maciej Delmanowski <ha...@po...> # Modifications, debugging and improvments by Dominique Michel -# <dom...@us...> 2008-2013 +# <dom...@us...> 2008-2019 # See ChangeLog for details # Overview: @@ -24,8 +24,10 @@ + I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Recreate the Playlists]' Music-RecreatePlaylist + I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Music player]' Popup /Preferences/MusicPlayer + I AddToMenu /Player "" Nop -+ I AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl -+ I AddToMenu /Player "" Nop ++ I Test (X qjackctl) AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl ++ I Test (X cadence) AddToMenu /Player '$[gt.Start Cadence]' Exec cadence-session-start --maybe-system-start; cadence ++ I Test (X qjackctl) AddToMenu /Player "" Nop ++ I TestRc (NoMatch) Test (X cadence) AddToMenu /Player "" Nop + I AddToMenu /Player '$[gt.Start C* Music Player]' AT cmus cmus + I AddToMenu /Player '$[gt.Stop player]' Exec exec killall -9 cmus @@ -117,6 +119,14 @@ + I AddToMenu /Music "" Nop + I AddToMenu /Music '$[gt.Load playlist]' Popup /Music/LoadPlaylist + I AddToMenu /Music '$[gt.Music player]' Popup /Preferences/MusicPlayer ++ I AddToMenu /Music "" Nop ++ I Test (X qjackctl) AddToMenu /Music '$[gt.Start QJackCtl]' Exec exec qjackctl ++ I Test (X cadence) AddToMenu /Music '$[gt.Start Cadence]' Exec cadence-session-start --maybe-system-start; cadence ++ I Test (X qjackctl) AddToMenu /Music "" Nop ++ I TestRc (NoMatch) Test (X cadence) AddToMenu /Music "" Nop ++ I AddToMenu /Music '$[gt.Start C* Music Player]' AT cmus cmus ++ I AddToMenu /Music '$[gt.Stop player]' Exec exec killall -9 cmus ++ I AddToMenu /Music '$[gt.Show/Hide Audio controls]' Music-QJackGUI # Fake button functions see Music-cdcd {{{1 Modified: fvwm/components/functions/Music-mocp =================================================================== --- fvwm/components/functions/Music-mocp 2019-08-13 17:38:31 UTC (rev 915) +++ fvwm/components/functions/Music-mocp 2019-08-14 04:14:19 UTC (rev 916) @@ -1,7 +1,7 @@ # Support for 'Music On Console' music player # Written by: Maciej Delmanowski <ha...@po...> # Modded by: rysiul <tu...@o2...> -# Modifications, debugging and improvments by Dominique Michel 2008-2013 +# Modifications, debugging and improvments by Dominique Michel 2008-2019 # <dom...@us...> # Initialisations, shared functions @@ -22,11 +22,12 @@ + I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Recreate the Playlists]' Music-RecreatePlaylist + I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Music player]' Popup /Preferences/MusicPlayer + I AddToMenu /Player "" Nop -+ I AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl -+ I AddToMenu /Player "" Nop ++ I Test (X qjackctl) AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl ++ I Test (X cadence) AddToMenu /Player '$[gt.Start Cadence]' Exec cadence-session-start --maybe-system-start; cadence ++ I Test (X qjackctl) AddToMenu /Player "" Nop ++ I TestRc (NoMatch) Test (X cadence) AddToMenu /Player "" Nop + I AddToMenu /Player '$[gt.Start Music On Console]' AT mocp mocp + I AddToMenu /Player '$[gt.Stop player]' Exec exec killall -9 mocp -+ I AddToMenu /Player '$[gt.Show/Hide player]' Music-GUI # mouse 2 Music-GUI : allready here {{{2 # mouse 3 Music-QJackGUI : in Music @@ -107,6 +108,15 @@ + I AddToMenu /Music '$[gt.Stop playback]' Music-Stop + I AddToMenu /Music '$[gt.Play/Pause]' Music-PlayPause + I AddToMenu /Music "" Nop ++ I AddToMenu /Music '$[gt.Start Music On Console]' AT mocp mocp ++ I AddToMenu /Music '$[gt.Stop player]' Exec exec killall -9 mocp ++ I AddToMenu /Music '$[gt.Show/Hide player]' Music-GUI ++ I AddToMenu /Music '$[gt.Show/Hide Audio controls]' Music-QJackGUI ++ I AddToMenu /Music "" Nop ++ I Test (X qjackctl) AddToMenu /Music '$[gt.Start QJackCtl]' Exec exec qjackctl ++ I Test (X cadence) AddToMenu /Music '$[gt.Start Cadence]' Exec cadence-session-start --maybe-system-start; cadence ++ I Test (X qjackctl) AddToMenu /Music "" Nop ++ I TestRc (NoMatch) Test (X cadence) AddToMenu /Music "" Nop + I AddToMenu /Music '$[gt.Music player]' Popup /Preferences/MusicPlayer # Fake button functions {{{1 Modified: fvwm/components/functions/Music-mpd =================================================================== --- fvwm/components/functions/Music-mpd 2019-08-13 17:38:31 UTC (rev 915) +++ fvwm/components/functions/Music-mpd 2019-08-14 04:14:19 UTC (rev 916) @@ -1,7 +1,7 @@ # Support for MPD music player # Written by: Maciej Delmanowski <ha...@po...> # sed commands by: Grzegorz Niewęgłowski <ho...@do...> -# Modifications, debugging and improvments by Dominique Michel 2008-2013 +# Modifications, debugging and improvments by Dominique Michel 2008-2019 # <dom...@us...> # Overview: @@ -27,11 +27,12 @@ + I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Recreate the Playlists]' Music-RecreatePlaylist + I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Music player]' Popup /Preferences/MusicPlayer + I AddToMenu /Player "" Nop -+ I AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl -+ I AddToMenu /Player "" Nop ++ I Test (X qjackctl) AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl ++ I Test (X cadence) AddToMenu /Player '$[gt.Start Cadence]' Exec cadence-session-start --maybe-system-start; cadence ++ I Test (X qjacjctl) AddToMenu /Player "" Nop ++ I TestRc (NoMatch) Test (X cadence) AddToMenu /Player "" Nop + I AddToMenu /Player '$[gt.Start Music Player Daemon]' Exec exec mpd + I AddToMenu /Player '$[gt.Stop player]' Exec exec killall -9 mpd -+ I AddToMenu /Player '$[gt.Show/Hide GMPC]' Music-GUI # mouse 2 Music-GUI : allready here {{{2 # mouse 3 Music-QJackGUI : in Music @@ -183,8 +184,13 @@ + I AddToMenu /Music "" Nop + I AddToMenu /Music '$[gt.Stop playback]' Music-Stop + I AddToMenu /Music '$[gt.Show/Hide player]' Music-GUI ++ I AddToMenu /Music '$[gt.Show/Hide Audio controls]' Music-QJackGUI + I AddToMenu /Music '$[gt.Play/Pause]' Music-PlayPause + I AddToMenu /Music "" Nop ++ I Test (X qjackctl) AddToMenu /Music '$[gt.Start QJackCtl]' Exec exec qjackctl ++ I Test (X cadence) AddToMenu /Music '$[gt.Start Cadence]' Exec cadence-session-start --maybe-system-start; cadence ++ I Test (X qjacjctl) AddToMenu /Music "" Nop ++ I TestRc (NoMatch) Test (X cadence) AddToMenu /Player "" Nop + I AddToMenu /Music '$[gt.Music player]' Popup /Preferences/MusicPlayer # Fake button functions {{{1 Modified: fvwm/components/functions/Music-quodlibet =================================================================== --- fvwm/components/functions/Music-quodlibet 2019-08-13 17:38:31 UTC (rev 915) +++ fvwm/components/functions/Music-quodlibet 2019-08-14 04:14:19 UTC (rev 916) @@ -1,7 +1,7 @@ # Support for QuodLibet music player # Written by: Maciej Delmanowski <ha...@po...> # sed commands by: Grzegorz Niewęgłowski <ho...@do...> -# Modifications, debugging and improvments by Dominique Michel 2008-2013 +# Modifications, debugging and improvments by Dominique Michel 2008-2019 # <dom...@us...> # Initialisations, shared functions @@ -18,11 +18,12 @@ + I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Recreate the Playlists]' Music-RecreatePlaylist + I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Music player]' Popup /Preferences/MusicPlayer + I AddToMenu /Player "" Nop -+ I AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl -+ I AddToMenu /Player "" Nop ++ I Test (X qjackctl) AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl ++ I Test (X cadence) AddToMenu /Player '$[gt.Start Cadence]' Exec cadence-session-start --maybe-system-start; cadence ++ I Test (X qjackctl) AddToMenu /Player "" Nop ++ I TestRc (NoMatch) Test (X cadence) AddToMenu /Player "" Nop + I AddToMenu /Player '$[gt.Start Quod Libet]' Exec exec quodlibet > /dev/null + I AddToMenu /Player '$[gt.Stop player]' Exec exec quodlibet --quit -+ I AddToMenu /Player '$[gt.Show/Hide player]' Music-GUI # mouse 2 Music-GUI : allready here {{{2 ## mouse 3 Music-QJackGUI : in Music @@ -83,6 +84,11 @@ + I AddToMenu /Music "" Nop + I AddToMenu /Music '$[gt.Play/Pause]' Music-PlayPause + I AddToMenu /Music "" Nop ++ I Test (X qjackctl) AddToMenu /Music '$[gt.Start QJackCtl]' Exec exec qjackctl ++ I Test (X cadence) AddToMenu /Music '$[gt.Start Cadence]' Exec cadence-session-start --maybe-system-start; cadence ++ I AddToMenu /Music '$[gt.Show/Hide player]' Music-GUI ++ I AddToMenu /Music '$[gt.Show/Hide Audio controls]' Music-QJackGUI ++ I AddToMenu /Music "" Nop + I AddToMenu /Music '$[gt.Music player]' Popup /Preferences/MusicPlayer # Fake button functions {{{1 Modified: fvwm/components/functions/Music-xmms2 =================================================================== --- fvwm/components/functions/Music-xmms2 2019-08-13 17:38:31 UTC (rev 915) +++ fvwm/components/functions/Music-xmms2 2019-08-14 04:14:19 UTC (rev 916) @@ -1,7 +1,7 @@ # Support for XMMS2 # Author: Michal Gorny <per...@ma...> # Based on xmms2 command-line client, version 0.2 DrBombay -# Modifications, debugging and improvments by Dominique Michel 2008-2013 +# Modifications, debugging and improvments by Dominique Michel 2008-2019 # <dom...@us...> # Initialisations, shared functions {{{1 @@ -21,8 +21,10 @@ + I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Recreate the Playlists]' Music-RecreatePlaylist + I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Music player]' Popup /Preferences/MusicPlayer + I AddToMenu /Player "" Nop -+ I AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl -+ I AddToMenu /Player "" Nop ++ I Test (X qjackctl) AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl ++ I Test (X cadence) AddToMenu /Player '$[gt.Start Cadence]' Exec cadence-session-start --maybe-system-start; cadence ++ I Test (X qjackctl) AddToMenu /Player "" Nop ++ I TestRc (NoMatch) Test (X cadence) AddToMenu /Player "" Nop + I AddToMenu /Player '$[gt.Stop XMMS2]' Exec exec killall -9 xmms2d + I AddToMenu /Player '$[gt.Show/Hide GXMMS2]' Music-GUI @@ -171,9 +173,14 @@ + I AddToMenu /Music "" Nop + I AddToMenu /Music '$[gt.Stop playback]' Music-Stop + I AddToMenu /Music '$[gt.Show/Hide player]' Music-GUI ++ I AddToMenu /Music '$[gt.Show/Hide Audio controls]' Music-QJackGUI + I AddToMenu /Music '$[gt.Play]' Music-Play + I AddToMenu /Music '$[gt.Pause]' Music-Pause + I AddToMenu /Music "" Nop ++ I Test (X qjackctl) AddToMenu /Music '$[gt.Start QJackCtl]' Exec exec qjackctl ++ I Test (X cadence) AddToMenu /Music '$[gt.Start Cadence]' Exec cadence-session-start --maybe-system-start; cadence ++ I Test (X qjackctl) AddToMenu /Music "" Nop ++ I TestRc (NoMatch) Test (X cadence) AddToMenu /Music "" Nop + I AddToMenu /Music '$[gt.Music player]' Popup /Preferences/MusicPlayer # Music-Speed-Up This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |