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

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

Revision: 251
          http://sourceforge.net/p/fvwm-crystal/code/251
Author:   dominique_libre
Date:     2013-04-17 21:05:20 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
functions/Media: added missing functions from Music-mplayer*; functions/Music-mplayer: cleanup; added preliminary DVB support

Modified Paths:
--------------
    ChangeLog
    fvwm/components/functions/Media
    fvwm/components/functions/Music-mplayer
    fvwm/components/functions/Music-mplayer2

Modified: ChangeLog
===================================================================
--- ChangeLog	2013-04-17 20:22:46 UTC (rev 250)
+++ ChangeLog	2013-04-17 21:05:20 UTC (rev 251)
@@ -4,8 +4,8 @@
   scripts/FvwmMPD/*: make the windows and fonts bigger. Its better to big
   than too small
   functions/Music-mpd: cleanup
-  functions/Music: added missing functions from Music-mplayer
-  functions/Music-mplayer: cleanup; added preliminary DVB support.
+  functions/Music; functions/Media: added missing functions from Music-mplayer
+  functions/Music-mplayer*: cleanup; added preliminary DVB support.
 
 Mardi 16 Avril 2013 Dominique Michel
   funcctions/Preferences; functions/Preferences-Menu; functions/Wallpaper;

Modified: fvwm/components/functions/Media
===================================================================
--- fvwm/components/functions/Media	2013-04-17 20:22:46 UTC (rev 250)
+++ fvwm/components/functions/Media	2013-04-17 21:05:20 UTC (rev 251)
@@ -266,6 +266,10 @@
 + I DestroyMenu recreate /Playlist-button
 + I AddToMenu /Playlist-button '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
 + I AddToMenu /Playlist-button '$[gt.Copy playlist]' Popup /Music/CopyPlaylist
+Test (F /dev/dvb/adapter0/frontend0) + I AddToMenu /Playlist-button '$[gt.Watch DVB] 1' Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvb://1@
+Test (F /dev/dvb/adapter1/frontend0) + I AddToMenu /Playlist-button '$[gt.Watch DVB] 2' Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvb://2@
+Test (F /dev/dvb/adapter2/frontend0) + I AddToMenu /Playlist-button '$[gt.Watch DVB] 3' Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvb://3@
+Test (F /dev/dvb/adapter3/frontend0) + I AddToMenu /Playlist-button '$[gt.Watch DVB] 4' Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvb://4@
 + I AddToMenu /Playlist-button '$[gt.Load media file]' Popup /Music/LoadMovie
 + I AddToMenu /Playlist-button '$[gt.Play DVD]' Load-DVD
 + I AddToMenu /Playlist-button '$[gt.Load playlist]' Popup /Music/LoadMediaPlaylist
@@ -274,6 +278,12 @@
 AddToMenu /Playlist-button
 + DynamicPopupAction Function Playlist-generator-button
 
+# mplayer
+DestroyMenu /Playlist
+DestroyMenu /Playlist-bot
+DestroyFunc /Playlist-generator
+DestroyFunc /Playlist-generator-bot
+
 # mouse 2 Menu /Playback {{{2
 # alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms2
 DestroyFunc Music-Next
@@ -294,6 +304,9 @@
 # alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms2
 DestroyFunc Music-Pause
 
+# mplayer
+DestroyFunc Music-FrameStep
+
 # alsaplayer, audacious, cdcd, cmus, mocp, mpd, quodlibet
 DestroyFunc Music-PlayPause
 
@@ -342,6 +355,9 @@
 DestroyFunc Music-VolumeEn
 # audacious, mplayer
 DestroyFunc Music-Volume
+# mplayer
+DestroyFunc Music-VolumeUp
+DestroyFunc Music-VolumeDown
 
 # button menu (alsaplayer, audacious, mplayer)
 DestroyMenu /Music/Volume

Modified: fvwm/components/functions/Music-mplayer
===================================================================
--- fvwm/components/functions/Music-mplayer	2013-04-17 20:22:46 UTC (rev 250)
+++ fvwm/components/functions/Music-mplayer	2013-04-17 21:05:20 UTC (rev 251)
@@ -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...@us...> 2008-2013
 
 # Specific variables {{{1
 # We must start mplayer in slave mode and send the commands via a pipe
@@ -228,6 +228,10 @@
 + I AddToMenu /Playlist-bot '$[gt.Load playlist]' Popup /Music/LoadMediaPlaylist
 + I AddToMenu /Playlist-bot '$[gt.Load media file]' Popup /Music/LoadMovie
 + I AddToMenu /Playlist-bot '$[gt.Play DVD]' Load-DVD
+Test (F /dev/dvb/adapter3/frontend0) + I AddToMenu /Playlist-bot '$[gt.Watch DVB] 1' Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvb://4@
+Test (F /dev/dvb/adapter2/frontend0) + I AddToMenu /Playlist-bot '$[gt.Watch DVB] 2' Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvb://3@
+Test (F /dev/dvb/adapter1/frontend0) + I AddToMenu /Playlist-bot '$[gt.Watch DVB] 3' Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvb://2@
+Test (F /dev/dvb/adapter0/frontend0) + I AddToMenu /Playlist-bot '$[gt.Watch DVB] 4' Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvb://1@
 #+ I AddToMenu /Playlist-bot '$[gt.Clear playlist]' Music-ClearPlaylist
 + I AddToMenu /Playlist-bot '$[gt.Copy playlist]' Popup /Music/CopyPlaylist
 + I AddToMenu /Playlist-bot '$[gt.Remove playlist]' Popup /Music/RemovePlaylist

Modified: fvwm/components/functions/Music-mplayer2
===================================================================
--- fvwm/components/functions/Music-mplayer2	2013-04-17 20:22:46 UTC (rev 250)
+++ fvwm/components/functions/Music-mplayer2	2013-04-17 21:05:20 UTC (rev 251)
@@ -1,36 +1,31 @@
 # Support for MPlayer2 media player into Fvwm-Crystal
-# Written by: Dominique Michel <dominique_libreourceforge.net> 2009-2013
+# Written by: Dominique Michel <dom...@us...> 2009-2013
 
-# Initialisations, shared functions {{{1
-Include components/functions/Media
-
 # Variables {{{1
 # We must start mplayer2 in slave mode and send the commands via a pipe
 # Create the pipe if it doesn't exist:
 Piperead 'echo InfoStoreAdd USERDIR `id -un`'
 Test (!F /home/$[infostore.USERDIR]/.mplayer/pipe) PipeRead 'mkfifo /home/$[infostore.USERDIR]/.mplayer/pipe'
 
+# Initialisations, shared functions {{{1
+Include components/functions/Media
+
 # First button [[[1
 # 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 MPlayer2]' Music-Start "mplayer2 -ao jack, -fs -fixed-vo -slave -idle -capture -input file=/home/$[infostore.USERDIR]/.mplayer/pipe"
 Test (x xdradio) + '$[gt.Start XDRadio]' Music-Start "xdradio"
 
-DestroyFunc Music-Kill
 AddToFunc Music-Kill
 + I Exec exec echo "quit" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
-DestroyFunc Music-GUI
 AddToFunc Music-GUI
 + I All (XDRadio) Iconify toggle
 
-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
@@ -51,7 +46,6 @@
 # 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]
 + I Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvdnav://
@@ -61,27 +55,21 @@
 Include tmp/MenuMovieDirectory
 
 # mouse 2 Menu /Playback {{{1
-DestroyFunc Music-Pause
 AddToFunc Music-Pause
 + I Exec exec echo "pause" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
-DestroyFunc Music-FrameStep
 AddToFunc Music-FrameStep
 + I Exec exec echo "frame_step" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
-DestroyFunc Music-Next
 AddToFunc Music-Next
 + I Exec exec echo "pt_step 1" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
-DestroyFunc Music-Prev
 AddToFunc Music-Prev
 + I Exec exec echo "pt_step -1" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
-DestroyFunc Music-Jump
 AddToFunc Music-Jump
 + I Exec exec echo "seek $0 1" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
-DestroyMenu /Music/Jump
 AddToMenu /Music/Jump
 + " 96 %" Music-Jump '96'
 + " 80 %" Music-Jump '80'
@@ -94,11 +82,9 @@
 + "  1 %" Music-Jump '1'
 + '$[gt.Start]' Music-Jump '0'
 
-DestroyFunc Music-Seek
 AddToFunc Music-Seek
 + I Exec exec echo "seek $0 0" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
-DestroyMenu /Music/Seek
 AddToMenu /Music/Seek
 + '$[gt.+ 10 min]' Music-Seek '600'
 + '$[gt.+ 5 min]' Music-Seek '300'
@@ -121,7 +107,6 @@
 + '$[gt.- 5 min]' Music-Seek '-300'
 + '$[gt.- 10 min]' Music-Seek '-600'
 
-DestroyFunc Playback-generator
 AddToFunc Playback-generator
 + I DestroyMenu recreate /Playback
 + I AddToMenu /Playback '$[gt.Pause]' Music-Pause
@@ -139,17 +124,14 @@
 # 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 2 Music-PlayPause : allready here {{{2
 # mouse 3 Menu /Music/Volume {{{2
-DestroyFunc Music-Volume
 AddToFunc Music-Volume
 + I Exec exec echo "volume $0 1" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
-DestroyMenu /Music/Volume
 AddToMenu /Music/Volume
 + '$[gt.MPlayer volume]' Nop
 + " 0 db" Music-Volume "100"
@@ -163,24 +145,20 @@
 + " 0" Music-Volume "0"
 
 # mouse 4 Music-Speed-Up {{{2
-DestroyFunc Music-Speed-Up
 AddToFunc Music-Speed-Up
 + I PipeRead 'echo "speed_set $($[FVWM_SYSTEMDIR]/scripts/speed_value +1comma mplayer $[infostore.speed])" > /home/$[infostore.USERDIR]/.mplayer/pipe ; echo InfoStoreAdd speed $($[FVWM_SYSTEMDIR]/scripts/speed_value +1comma mplayer $[infostore.speed])'
 
 # mouse 5 Music-Speed-Down {{{2
-DestroyFunc Music-Speed-Down
 AddToFunc Music-Speed-Down
 + I PipeRead 'echo "speed_set $($[FVWM_SYSTEMDIR]/scripts/speed_value -1comma mplayer $[infostore.speed])" > /home/$[infostore.USERDIR]/.mplayer/pipe ; echo InfoStoreAdd speed $($[FVWM_SYSTEMDIR]/scripts/speed_value -1comma mplayer $[infostore.speed])'
 
 # Last button {{{1
 # speed controls
 # mouse 1 Menu /Speed {{{2
-DestroyFunc Music-Speed
 AddToFunc Music-Speed
 + I PipeRead 'echo "speed_set $($[FVWM_SYSTEMDIR]/scripts/speed_value "$0" mplayer $[infostore.speed])" > /home/$[infostore.USERDIR]/.mplayer/pipe ; echo InfoStoreAdd "speed $($[FVWM_SYSTEMDIR]/scripts/speed_value "$[0]" mplayer $[infostore.speed])"'
 
 # speed_set <0.01 to 100>
-DestroyMenu /Speed
 AddToMenu /Speed
 + '$[gt.Speed control]' Nop
 + "" Nop
@@ -216,29 +194,28 @@
 
 # Basic control functions {{{1
 
-DestroyFunc Music-VolumeUp
 AddToFunc Music-VolumeUp
 + I Exec exec echo "volume 10 0" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
-DestroyFunc Music-VolumeDown
 AddToFunc Music-VolumeDown
 + I Exec exec echo "volume -10 0" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
 # Playlist functions and menus {{{1
 
-DestroyMenu /Playlist
 AddToMenu /Playlist
 + DynamicPopupAction Function /Playlist-generator
 
-DestroyMenu /Playlist-bot
 AddToMenu /Playlist-bot
 + DynamicPopupAction Function /Playlist-generator-bot
 
 # Main functions and menus {{{1
 
-DestroyFunc /Playlist-generator
 AddToFunc /Playlist-generator
 + I DestroyMenu recreate /Playlist
+Test (F /dev/dvb/adapter0/frontend0) + I AddToMenu /Playlist '$[gt.Watch DVB] 1' Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvb://1@
+Test (F /dev/dvb/adapter1/frontend0) + I AddToMenu /Playlist '$[gt.Watch DVB] 2' Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvb://2@
+Test (F /dev/dvb/adapter2/frontend0) + I AddToMenu /Playlist '$[gt.Watch DVB] 3' Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvb://3@
+Test (F /dev/dvb/adapter3/frontend0) + I AddToMenu /Playlist '$[gt.Watch DVB] 4' Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvb://4@
 + I AddToMenu /Playlist '$[gt.Play DVD]' Load-DVD
 + I AddToMenu /Playlist '$[gt.Load media file]' Popup /Music/LoadMovie
 + I AddToMenu /Playlist '$[gt.Load playlist]' Popup /Music/LoadPlaylist
@@ -246,28 +223,26 @@
 + I AddToMenu /Playlist '$[gt.Copy playlist]' Popup /Music/CopyPlaylist
 + I AddToMenu /Playlist '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
 
-DestroyFunc /Playlist-generator-bot
 AddToFunc /Playlist-generator-bot
 + I DestroyMenu recreate /Playlist-bot
 + I AddToMenu /Playlist-bot '$[gt.Load playlist]' Popup /Music/LoadPlaylist
 + I AddToMenu /Playlist-bot '$[gt.Load media file]' Popup /Music/LoadMovie
 + I AddToMenu /Playlist-bot '$[gt.Play DVD]' Load-DVD
+Test (F /dev/dvb/adapter3/frontend0) + I AddToMenu /Playlist-bot '$[gt.Watch DVB] 1' Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvb://4@
+Test (F /dev/dvb/adapter2/frontend0) + I AddToMenu /Playlist-bot '$[gt.Watch DVB] 2' Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvb://3@
+Test (F /dev/dvb/adapter1/frontend0) + I AddToMenu /Playlist-bot '$[gt.Watch DVB] 3' Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvb://2@
+Test (F /dev/dvb/adapter0/frontend0) + I AddToMenu /Playlist-bot '$[gt.Watch DVB] 4' Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvb://1@
 #+ I AddToMenu /Playlist-bot '$[gt.Clear playlist]' Music-ClearPlaylist
 + I AddToMenu /Playlist-bot '$[gt.Copy playlist]' Popup /Music/CopyPlaylist
 + I AddToMenu /Playlist-bot '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
 
 # Recipe without audio buttons use the following:
-DestroyMenu /Music
-AddToMenu /Music
-+ DynamicPopupAction Function /Music-generator
-
-DestroyFunc /Music-generator
 AddToFunc /Music-generator
 + I DestroyMenu recreate /Music
 + I AddToMenu /Music '$[gt.Player]' Popup /Player
 + I AddToMenu /Music '$[gt.Show/Hide GUI]' Music-GUI
 + I AddToMenu /Music '$[gt.Playback]' Popup /Playback
-+ I AddToMenu /Music '$[gt.Load]' Popup /Playlist
++ I AddToMenu /Music '$[gt.Playlist]' Popup /Playlist
 + I AddToMenu /Music '$[gt.Mixer]' Popup /Mixer
 + I AddToMenu /Music '$[gt.Speed]' Popup /Speed
 + I AddToMenu /Music '$[gt.Show/Hide QJackCtl]' Music-QJackGUI

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