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

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

Revision: 243
          http://sourceforge.net/p/fvwm-crystal/code/243
Author:   dominique_libre
Date:     2013-04-16 16:04:17 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
functions/Music-mocp: cleanup; added preferences & player menu when missing

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

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

Modified: fvwm/components/functions/Music
===================================================================
--- fvwm/components/functions/Music	2013-04-15 22:03:30 UTC (rev 242)
+++ fvwm/components/functions/Music	2013-04-16 16:04:17 UTC (rev 243)
@@ -91,6 +91,7 @@
 Style cmus		NoActiveIconOverride, NoIcon, Sticky, WindowListSkip, StaysOnTop
 # Mocp (NoIcon doesn't work -> ToDo: use FvwmIdent)
 Style mocp		NoActiveIconOverride, NoIcon, Sticky, WindowListSkip, StaysOnTop
+Style MOC		UseStyle mocp
 
 Style MPlayer		!Title, !Borders, GnomeIgnoreHints, EWMHIgnoreStackingOrderHints
 Style "MPlayer - Video"	Title, Borders, GnomeIgnoreHints, EWMHIgnoreStackingOrderHints
@@ -237,7 +238,7 @@
 # mpd, xmms2
 DestroyFunc Music-Shuffle
 
-# (alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, mocp, mpd, mplayer, quodlibet, xmms2)
+# (all)
 DestroyFunc Playback-generator
 
 # alsaplayer

Modified: fvwm/components/functions/Music-mocp
===================================================================
--- fvwm/components/functions/Music-mocp	2013-04-15 22:03:30 UTC (rev 242)
+++ fvwm/components/functions/Music-mocp	2013-04-16 16:04:17 UTC (rev 243)
@@ -1,25 +1,20 @@
 # 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
-# <dom...@so...>
+# Modifications, debugging and improvments by Dominique Michel 2008-2013
+# <dom...@us...>
 
 # Initialisations, shared functions
 Include components/functions/Music
 
-###################
-## First button ###
-## Player controls and prefs ##
-###############################
-## mouse 1 Menu /Player
-#######################
-DestroyFunc Music-GUI
+# First button {{{1
+# Player controls and prefs
+# mouse 1 Menu /Player {{{2
 AddToFunc Music-GUI
 + I All (mocp) Close
 + I TestRc (NoMatch) None (mocp) AT mocp mocp
 
 # 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
@@ -31,24 +26,19 @@
 + 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
-## 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
-################################
-DestroyFunc FuncFvwmMenuAudioDirectory
+# Second button {{{1
+# Player controls and main vol
+# mouse 1 Menu /Playlist-button {{{1
 AddToFunc FuncFvwmMenuAudioDirectory
 + I PipeRead 'case "$0" in \
-	"$[AudioPlaylists]"*) myexec="mocp --sync --append";; \
-	"$[UserManagedAudioPlaylists]"*) myexec="mocp --sync --append";; \
+	"$[infostore.AudioPlaylists]"*) myexec="mocp --sync --append";; \
+	"$[infostore.UserManagedAudioPlaylists]"*) myexec="mocp --sync --append";; \
     esac; \
     test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
     test -f "$0"/.media.png && mypng="$0"/.media.png; \
@@ -58,64 +48,38 @@
     --exec-file "^${myexec}" --dir "$0" \
     --exec-t="-"'
 
-DestroyMenu /Music/LoadPlaylist
-AddToMenu /Music/LoadPlaylist
-+ MissingSubmenuFunction FuncFvwmMenuAudioDirectory
-+ '%22x22/categories/video_movies_view.png%$[gt.Audio playlists]' Popup $[AudioPlaylists]
-+ '%22x22/categories/video_movies_view.png%$[gt.Personal audio playlists]' Popup $[UserManagedAudioPlaylists]
-
-DestroyFunc Music-ClearPlaylist
 AddToFunc Music-ClearPlaylist
 + I Exec exec mocp --sync --clear
 
-DestroyFunc Music-RemovePlaylist-generator
-AddToFunc Music-RemovePlaylist-generator
-+ I DestroyMenu recreate /Music/RemovePlaylist
-+ I AddToMenu /Music/RemovePlaylist
-+ I PipeRead 'for i in $[NonManagedPlaylists]/*.{m3u,pls}; do name=$(basename "$i"); sname=${name%%.m3u}; sname=${sname%%.pls}; echo \"AddToMenu /Music/RemovePlaylist \'$sname\' Exec rm -f \'$i\'\"; done'
-
-DestroyMenu /Music/RemovePlaylist
-AddToMenu /Music/RemovePlaylist
-+ DynamicPopupAction Function Music-RemovePlaylist-generator
-
-DestroyFunc Playlist-generator-button
 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.Clear playlist]' Music-ClearPlaylist
 + I AddToMenu /Playlist-button '$[gt.Load playlist]' Popup /Music/LoadPlaylist
-+ I AddToMenu /Playlist-button '$[gt.Clear playlist]' Music-ClearPlaylist
-+ I AddToMenu /Playlist-button '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
 
-DestroyMenu /Playlist-button
 AddToMenu /Playlist-button
 + DynamicPopupAction Function Playlist-generator-button
 
-## mouse 2 Menu /Playback
-#########################
-DestroyFunc Music-Next
+# mouse 2 Menu /Playback {{{2
 AddToFunc Music-Next
 + I Exec exec mocp --sync --next
 
-DestroyFunc Music-Prev
 AddToFunc Music-Prev
 + I Exec exec mocp --sync --previous
 
-DestroyFunc Music-Stop
 AddToFunc Music-Stop
 + I Exec exec mocp --sync --stop
 
-DestroyFunc Music-Play
 AddToFunc Music-Play
 + I Exec exec mocp --sync --play
 
-DestroyFunc Music-Pause
 AddToFunc Music-Pause
 + I Exec exec mocp --sync --pause
 
-DestroyFunc Music-PlayPause
 AddToFunc Music-PlayPause
 + I Exec exec mocp --sync --toggle-pause
 
-DestroyFunc Playback-generator
 AddToFunc Playback-generator
 + I DestroyMenu recreate /Playback
 + I AddToMenu /Playback '$[gt.Next]' Music-Next
@@ -126,24 +90,39 @@
 + I AddToMenu /Playback '$[gt.Pause]' Music-Pause
 + I AddToMenu /Playback '$[gt.Play/Pause]' Music-PlayPause
 
-## mouse 3 Menu /Mixer : in components/Mixer
-## mouse 4 Music-Next : allready here
-## mouse 4 Music-Prev : allready here
+# mouse 3 Menu /Mixer : in components/Mixer {{{2
+# mouse 4 Music-Next : allready here
+# mouse 4 Music-Prev : allready here
 
-########################
-# Main functions and menus
-DestroyMenu /Music
-AddToMenu /Music
-+ DynamicPopupAction Function Music-generator
-
-DestroyFunc Music-generator
+# Main functions and menus {{{1
 AddToFunc Music-generator
 + I DestroyMenu recreate /Music
 + I AddToMenu /Music '$[gt.Load playlist]'	Popup /Music/LoadPlaylist
 + I AddToMenu /Music '$[gt.Clear playlist]'	Music-ClearPlaylist
 + I AddToMenu /Music '$[gt.Remove playlist]'	Popup /Music/RemovePlaylist
++ I AddToMenu /Playlist-button '$[gt.Playlist copy]' Popup /Music/CopyPlaylist
 + 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.Music player]'	Popup /Preferences/MusicPlayer
 
+# Fake button functions {{{1
+# Menu /Music/Volume (TODO)
+AddToMenu /Music/Volume
++ "" Nop
+# 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.