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

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

Revision: 242
          http://sourceforge.net/p/fvwm-crystal/code/242
Author:   dominique_libre
Date:     2013-04-15 22:03:30 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
functions/Music-ccleanup; added preferences and playlist menumus:

Modified Paths:
--------------
    ChangeLog
    fvwm/components/functions/Music-cmus

Modified: ChangeLog
===================================================================
--- ChangeLog	2013-04-15 19:00:58 UTC (rev 241)
+++ ChangeLog	2013-04-15 22:03:30 UTC (rev 242)
@@ -4,6 +4,7 @@
 
 + Export.README: Free Export Regulations rules
   recipes/Amiga: moved the SetEnv to InfoStore
+  functions/Music-cmus: cleanup; added prefernces and playlist menu
 
 Samedi 13 Avril 2013 Dominique Michel
 

Modified: fvwm/components/functions/Music-cmus
===================================================================
--- fvwm/components/functions/Music-cmus	2013-04-15 19:00:58 UTC (rev 241)
+++ fvwm/components/functions/Music-cmus	2013-04-15 22:03:30 UTC (rev 242)
@@ -1,7 +1,8 @@
 # Support for C* Music Player
 # Written by: Maciej Delmanowski <ha...@po...>
 # Modifications, debugging and improvments by Dominique Michel
-# <dom...@so...>
+# <dom...@us...> 2008-2013
+# See ChangeLog for details
 
 # Overview:
 # This is a set of function for controlling the C* Music Player
@@ -11,18 +12,13 @@
 # Initialisations, shared functions
 Include components/functions/Music
 
-###################
-## First button ###
-## Player controls and prefs ##
-###############################
-## mouse 1 Menu /Player
-#######################
-DestroyFunc Music-GUI
+# First button
+# Player controls and prefs {{{1
+# mouse 1 Menu /Player {{{2
 AddToFunc Music-GUI
 + I All (cmus) Iconify toggle
 
 # Player-generator (All)
-DestroyFunc Player-generator
 AddToFunc Player-generator
 + I DestroyMenu recreate /Player
 + I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Recreate the Playlists]' Music-RecreatePlaylist
@@ -33,58 +29,66 @@
 + I AddToMenu /Player '$[gt.Start C* Music Player]' AT cmus cmus
 + I AddToMenu /Player '$[gt.Stop player]' Exec exec killall -9 cmus
 
-## mouse 2 Music-GUI : allready here
-## mouse 3 Music-QJackGUI : in Music
-##
-## mouse 4 Mixer-Volume-Up
-## mouse 5 Mixer-Volume-Down
-## are in components/Mixer
+# mouse 2 Music-GUI : allready here {{{2
+# mouse 3 Music-QJackGUI : in Music
+# mouse 4 Mixer-Volume-Up
+# mouse 5 Mixer-Volume-Down
+# are in components/Mixer
 
-####################
-## Second button ###
-## Player controls and main vol ##
-##################################
-## mouse 1 Menu /Playlist-button
-################################
-## mouse 2 Menu /Playback
-#########################
-DestroyFunc Music-Next
+# Second button
+# Player controls and main vol
+# mouse 1 Menu /Playlist-button {{{2
+
+# /Music/LoadPlaylist
+AddToFunc FuncFvwmMenuAudioDirectory
++ I PipeRead 'case "$0" in \
+	"$[infostore.AudioPlaylists]"*) myexec="cmus-remote -l";; \
+	"$[infostore.UserManagedAudioPlaylists]"*) myexec="cmus-remote -l";; \
+    esac; \
+    test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
+    test -f "$0"/.media.png && mypng="$0"/.media.png; \
+    fvwm-menu-directory --icon-title "${mytitle:-22x22/categories/directory.png}" \
+    --icon-file "${mypng:-22x22/categories/Audio.png}" \
+    --dir "$0" --exec-title "-" --exec-file "^${myexec}" \
+    --func-name "FuncFvwmMenuAudioDirectory"'
+
+AddToFunc Playlist-generator-button
++ I DestroyMenu recreate /Playlist-button
++ I AddToMenu /Playlist-button '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
++ I AddToMenu /Playlist-button '$[gt.Playlist copy]' Popup /Music/CopyPlaylist
++ I AddToMenu /Playlist-button '$[gt.Load playlist]' Popup /Music/LoadPlaylist
+
+AddToMenu /Playlist-button
++ DynamicPopupAction Function Playlist-generator-button
+
+# mouse 2 Menu /Playback
 AddToFunc Music-Next
 + I Exec cmus-remote --next > /dev/null
 
-DestroyFunc Music-Prev
 AddToFunc Music-Prev
 + I Exec cmus-remote --prev > /dev/null
 
-DestroyFunc Music-ToggleRandom
 AddToFunc Music-ToggleRandom
 + I Exec cmus-remote --shuffle > /dev/null
 
-DestroyFunc Music-Stop
 AddToFunc Music-Stop
 + I Exec cmus-remote --stop > /dev/null
 
-DestroyFunc Music-Play
 AddToFunc Music-Play
 + I Exec cmus-remote --play > /dev/null
 
-DestroyFunc Music-Pause
 AddToFunc Music-Pause
 + I Exec cmus-remote --pause > /dev/null
 
-DestroyFunc Music-PlayPause
 AddToFunc Music-PlayPause
 + I Exec cmus-remote --pause > /dev/null
 
-DestroyFunc Music-Forward
 AddToFunc Music-Forward
 + I Exec cmus-remote --shuffle > /dev/null; cmus-remote --next > /dev/null; cmus-remote --shuffle > /dev/null
 
-DestroyFunc Music-Backward
 AddToFunc Music-Backward
 + I Exec cmus-remote --shuffle > /dev/null; cmus-remote --prev > /dev/null; cmus-remote --shuffle > /dev/null
 
-DestroyFunc Playback-generator
 AddToFunc Playback-generator
 + I DestroyMenu recreate /Playback
 + I AddToMenu /Playback '$[gt.Next]' Music-Next
@@ -98,15 +102,36 @@
 + I AddToMenu /Playback '$[gt.Forward]' Music-Forward
 + I AddToMenu /Playback '$[gt.Backward]' Music-Backward
 
-# ---------------------------------------------------------------------------
-# Main menu
-DestroyMenu /Music
-AddToMenu /Music
-+ '$[gt.Volume]' Popup /Mixer
-+ '$[gt.Toggle random]' Music-ToggleRandom
-+ '$[gt.Toggle repeat]' Exec mpc repeat
+# Main menu {{{1
+AddToFunc Music-generator
++ I DestroyMenu recreate /Music
++ I AddToMenu /Music '$[gt.Volume]'		Popup /Mixer
++ I AddToMenu /Music '$[gt.Toggle random]' 	Music-ToggleRandom
++ I AddToMenu /Music '$[gt.Toggle repeat]' 	Exec mpc repeat
++ I AddToMenu /Music "" Nop
++ I AddToMenu /Music '$[gt.Stop playback]'	Music-Stop
++ I AddToMenu /Music '$[gt.Play/Pause]'		Music-PlayPause
++ I AddToMenu /Music "" Nop
++ I AddToMenu /Music '$[gt.Load playlist]'	Popup /Music/LoadPlaylist
++ I AddToMenu /Music '$[gt.Music player]'	Popup /Preferences/MusicPlayer
+
+# Fake button functions see Music-cdcd {{{1
+
+# Menu /Music/Volume (TODO)
+AddToMenu /Music/Volume
 + "" Nop
-+ '$[gt.Stop playback]'		Music-Stop
-+ '$[gt.Play/Pause]'		Music-PlayPause
+# Music-Speed-Up
+AddToFunc Music-Speed-Up
++ I Nop
+# Music-Speed-Down
+AddToFunc Music-Speed-Down
++ I Nop
+# Menu /Speed
+AddToMenu /Speed
++ "" Nop
+# Music-Seek-+
+# Music-Seek--
+AddToFunc Music-Seek
++ I Nop
 
 # vim:ft=fvwm

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