[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[215]

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

Revision: 215
          http://sourceforge.net/p/fvwm-crystal/code/215
Author:   dominique_libre
Date:     2013-04-11 06:27:29 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
components/functions/Music-mplayer; components/functions/Music: various clenup. FAQ: tear off menus

Modified Paths:
--------------
    ChangeLog
    doc/FAQ
    fvwm/components/functions/Music
    fvwm/components/functions/Music-mplayer

Modified: ChangeLog
===================================================================
--- ChangeLog	2013-04-10 21:52:30 UTC (rev 214)
+++ ChangeLog	2013-04-11 06:27:29 UTC (rev 215)
@@ -1,5 +1,8 @@
 ChangeLog for FVWM-Crystal
 
+Jeudi 11 Avril 2013 Dominique Michel
+  FAQ: Added q.a. about tear off menus.
+  
 Mercredi 10 Avril 2013 Dominique Michel
 
 + scripts/media_directories: auto generation of the /Music/LoadMovies

Modified: doc/FAQ
===================================================================
--- doc/FAQ	2013-04-10 21:52:30 UTC (rev 214)
+++ doc/FAQ	2013-04-11 06:27:29 UTC (rev 215)
@@ -24,6 +24,7 @@
 3. Usage.
 	3.1: Where can I start some prefered application at startup?
 	3.2: Where can I add my prefered fvwm command?
+	3.3: How can I have a tear off menu?
 
 -----------------------------------------------------------------------------
    Frequently Asked Questions
@@ -218,3 +219,7 @@
 3.2 Q: Where can I add my prefered fvwm command?
     A: You want to use some custom styles, keybindings or so. Create the file
        ~/.fvwm-crystal/userconfig and add them here.
+
+3.3 Q: How can I have a tear off menu?
+    A: When in the menu you want to tear off, press the backspace key.
+       To remove the menu, press escape. This is a standard FVWM feature.

Modified: fvwm/components/functions/Music
===================================================================
--- fvwm/components/functions/Music	2013-04-10 21:52:30 UTC (rev 214)
+++ fvwm/components/functions/Music	2013-04-11 06:27:29 UTC (rev 215)
@@ -57,7 +57,8 @@
 # 	~/Playlists/User/Video for "by the user managed" video playlists
 #
 # 'Recreate the playlist' will manage ~/Playlists/Audio and ~/Playlists/Video
-# in a very simple way: delete all and recreate all.
+# in a very simple way: delete all and recreate all. At the same time, it will
+# create the user managed directories if they don't exist.
 #
 # Todo: function AddFavorite (add a playlist from ~/Playlists/Audio or
 #	~/Playlists/Video to the "by the user managed" playlists
@@ -135,9 +136,7 @@
 # Recreate the playlists (all)
 DestroyFunc Music-RecreatePlaylist
 AddToFunc Music-RecreatePlaylist
-#+ I Exec FvwmCommand '
 + I A $[FVWM_SYSTEMDIR]/scripts/make_all_playlists $[infostore.AudioPlaylists] $[infostore.VideoPlaylists]
-#$@'
 
 # wrapper for cdcd
 DestroyFunc Music-cdcd
@@ -237,13 +236,13 @@
 # alsaplayer, audacious, cdcd, cmus, mocp, mpd, quodlibet, xmms2
 DestroyFunc Music-Stop
 
-# alsaplayer, audacious, cdcd, cmus, mocp, mpd, quodlibet, xmms2
+# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms2
 DestroyFunc Music-Play
 
 # alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms2
 DestroyFunc Music-Pause
 
-# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer (button 3), quodlibet
+# alsaplayer, audacious, cdcd, cmus, mocp, mpd, quodlibet
 DestroyFunc Music-PlayPause
 
 # cdcd, cmus, mpd, quodlibet
@@ -283,8 +282,8 @@
 
 # Third button {{{1
 # Player controls and vol
-# mouse 1 Music-Pause : allready here {{{2
-# mouse 2 Music-PlayPause : allready here
+# mouse 1 Music-Play : allready here {{{2
+# mouse 2 Music-Pause : allready here
 # mouse 3 Menu /Music/Volume
 # alsaplayer
 DestroyFunc Music-VolumeFr

Modified: fvwm/components/functions/Music-mplayer
===================================================================
--- fvwm/components/functions/Music-mplayer	2013-04-10 21:52:30 UTC (rev 214)
+++ fvwm/components/functions/Music-mplayer	2013-04-11 06:27:29 UTC (rev 215)
@@ -1,5 +1,5 @@
 # Support for MPlayer media player into Fvwm-Crystal
-# Written by: Dominique Michel <dom...@so...> 2008-2013
+# Written by: Dominique Michel <dom...@so...> 2008-2013
 
 # Load shared functions and initialisations {{{1 
 Include components/functions/Music
@@ -11,16 +11,14 @@
 Test (!F /home/$[infostore.USERDIR]/.mplayer/pipe) PipeRead 'mkfifo /home/$[infostore.USERDIR]/.mplayer/pipe'
 
 # First button {{{1
-# Player controls and prefs ##
-# mouse 1 Menu /Player
-#######################
+# Player controls and prefs 
+# mouse 1 Menu /Player {{{2
 DestroyFunc Music-Start
 AddToFunc Music-Start
 + I Exec exec $0
 
 DestroyMenu /Music/Start
 AddToMenu /Music/Start
-#+ '$[gt.Start MPlayer]' Music-Start "mplayer -ao jack, -menu -fs -fixed-vo -slave -idle -input file=/home/$[infostore.USERDIR]/.mplayer/pipe"
 + '$[gt.Start MPlayer]' Music-Start "mplayer -ao jack, -fs -fixed-vo -slave -idle -input file=/home/$[infostore.USERDIR]/.mplayer/pipe"
 Test (x xdradio) + '$[gt.Start XDRadio]' Music-Start "xdradio"
 
@@ -31,7 +29,6 @@
 
 DestroyFunc Music-GUI
 AddToFunc Music-GUI
-+ I Exec exec echo "menu up" > /home/$[infostore.USERDIR]/.mplayer/pipe
 + I All (XDRadio) Iconify toggle
 
 DestroyFunc Player-generator
@@ -46,19 +43,16 @@
 + I AddToMenu /Player '$[gt.Stop MPlayer]' Music-Kill
 + I AddToMenu /Player '$[gt.Show/Hide menu]' 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
-################################
+# Second button {{{1
+# Player controls and main vol
+# mouse 1 Menu /Playlist-button {{{2
+
 DestroyFunc Load-DVD
 AddToFunc Load-DVD
 + I Exec exec fvwm-crystal.mplayer-wrapper dvd $[infostore.USERDIR]
@@ -117,13 +111,11 @@
 AddToMenu /Playlist-button
 + DynamicPopupAction Function Playlist-generator-button
 
-## mouse 2 Menu /Playback
-#########################
+# mouse 2 Menu /Playback {{{2
 DestroyFunc Music-Pause
 AddToFunc Music-Pause
 + I Exec exec echo "pause" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
-# Todo
 DestroyFunc Music-FrameStep
 AddToFunc Music-FrameStep
 + I Exec exec echo "frame_step" > /home/$[infostore.USERDIR]/.mplayer/pipe
@@ -191,22 +183,23 @@
 + I AddToMenu /Playback '$[gt.Jump]' Popup /Music/Jump
 + I AddToMenu /Playback '$[gt.Seek]' Popup /Music/Seek
 
-## 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
 
-####################
-## Third button ###
-## Player controls and vol ##
-#############################
-## mouse 1 Music-Pause : allready here
-## mouse 2 Music-PlayPause
-DestroyFunc Music-PlayPause
-AddToFunc Music-PlayPause
+# Third button {{{1
+# Player controls and vol
+# mouse 1 Music-Play {{{2
+DestroyFunc Music-Play
+AddToFunc Music-Play
 + I Exec exec echo "frame_step" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
-## mouse 3 Menu /Music/Volume
-#############################
+# mouse 2 Music-PlayPause
+#DestroyFunc Music-PlayPause
+#AddToFunc Music-PlayPause
+#+ I Exec exec echo "pause" > /home/$[infostore.USERDIR]/.mplayer/pipe
+
+# mouse 3 Menu /Music/Volume {{{2
 DestroyFunc Music-Volume
 AddToFunc Music-Volume
 + I Exec exec echo "volume $0 1" > /home/$[infostore.USERDIR]/.mplayer/pipe
@@ -224,24 +217,19 @@
 + "- 36 db" Music-Volume "1.5625"
 + " 0" Music-Volume "0"
 
-## mouse 4 Music-Speed-Up
-#########################
+# mouse 4 Music-Speed-Up {{{2
 DestroyFunc Music-Speed-Up
 AddToFunc Music-Speed-Up
 + I PipeRead 'echo InfoStoreAdd speed `$[FVWM_SYSTEMDIR]/scripts/speed_value +1comma mplayer $[infostore.speed]`; echo "speed_set `$[FVWM_SYSTEMDIR]/scripts/speed_value +1comma mplayer $[infostore.speed]`" > /home/$[infostore.USERDIR]/.mplayer/pipe'
 
-## mouse 5 Music-Speed-Down
-###########################
+# mouse 5 Music-Speed-Down {{{2
 DestroyFunc Music-Speed-Down
 AddToFunc Music-Speed-Down
 + I PipeRead 'echo InfoStoreAdd speed `$[FVWM_SYSTEMDIR]/scripts/speed_value -1comma mplayer $[infostore.speed]`; echo "speed_set `$[FVWM_SYSTEMDIR]/scripts/speed_value -1comma mplayer $[infostore.speed]`" > /home/$[infostore.USERDIR]/.mplayer/pipe'
 
-##################
-## Last button ###
-## speed controls ##
-####################
-## mouse 1 Menu /Speed
-######################
+# Last button {{{1
+# speed controls
+# mouse 1 Menu /Speed {{{2
 DestroyFunc Music-Speed
 AddToFunc Music-Speed
 + I PipeRead 'echo InfoStoreAdd "speed `$[FVWM_SYSTEMDIR]/scripts/speed_value "$[0]" mplayer $[infostore.speed]`"; echo "speed_set `$[FVWM_SYSTEMDIR]/scripts/speed_value "$0" mplayer $[infostore.speed]`" > /home/$[infostore.USERDIR]/.mplayer/pipe'
@@ -278,11 +266,10 @@
 + '$[gt.Pause]' Music-Pause
 + '$[gt.- 1 comma]' Music-Speed '-1comma mplayer'
 
-## mouse 4 Button-Seek-+
-## mouse 5 Button-Seek--
+# mouse 4 Button-Seek-+ {{{2
+# mouse 5 Button-Seek--
 
-# ---------------------------------------------------------------------------
-# Basic control functions
+# Basic control functions {{{1
 
 DestroyFunc Music-VolumeUp
 AddToFunc Music-VolumeUp
@@ -292,19 +279,8 @@
 AddToFunc Music-VolumeDown
 + I Exec exec echo "volume -10 0" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
-#------------------------------------------------------------------
-# Basic menus
+# Playlist functions and menus {{{1
 
-# Start Mplayer, "-ao jack," tell mplayer to first try jack, and if not found, it will try the other sound servers. 
-#DestroyMenu /Player
-#AddToMenu /Player
-#+ '$[gt.Start MPlayer]' Music-Start "mplayer -ao jack, -menu -fs -fixed-vo -slave -idle -input file=/home/$[infostore.USERDIR]/.mplayer/pipe"
-#+ '$[gt.Stop MPlayer]' Music-Kill
-# + '$[gt.Show/Hide player]' Music-GUI
-
-# ---------------------------------------------------------------------------
-# Playlist functions and menus
-
 DestroyMenu /Playlist
 AddToMenu /Playlist
 + DynamicPopupAction Function /Playlist-generator
@@ -313,8 +289,7 @@
 AddToMenu /Playlist-bot
 + DynamicPopupAction Function /Playlist-generator-bot
 
-#-----------------------------------------------------------------------------------
-# Main functions and menus
+# Main functions and menus {{{1
 
 DestroyFunc /Playlist-generator
 AddToFunc /Playlist-generator

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