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

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

Revision: 291
          http://sourceforge.net/p/fvwm-crystal/code/291
Author:   dominique_libre
Date:     2013-04-24 23:37:59 +0000 (Wed, 24 Apr 2013)
Log Message:
-----------
Added DVB channel lists support with preferences (mplayer)

Modified Paths:
--------------
    ChangeLog
    fvwm/components/functions/Media
    fvwm/components/functions/Music
    fvwm/components/functions/Preferences-Menu

Modified: ChangeLog
===================================================================
--- ChangeLog	2013-04-24 17:36:01 UTC (rev 290)
+++ ChangeLog	2013-04-24 23:37:59 UTC (rev 291)
@@ -5,6 +5,8 @@
   functions/Preferences-Menu: re-added Eterm support
   INSTALL: Added xcompmgr and transset into the optional dependencies
   functions/Window-Basic: replaced transset-df ny transset
+  functions/Media; functions/Music; Functions/Preferences-Menu: Add DVB channel
+  lists support for mplayer with preferences
 
 Mardi 23 Avril 2913 Dominique Michl
   recipes/*; functions/EWMH-BaseStruts; functions/NotificationAreaManager":

Modified: fvwm/components/functions/Media
===================================================================
--- fvwm/components/functions/Media	2013-04-24 17:36:01 UTC (rev 290)
+++ fvwm/components/functions/Media	2013-04-24 23:37:59 UTC (rev 291)
@@ -135,7 +135,8 @@
 # player quit (alsaplayer, mplayer)
 DestroyFunc Music-Kill
 AddToFunc Music-Kill
-+ I Exec exec echo "quit" > /home/$[infostore.USERDIR]/.mplayer/pipe
++ I Exec exec killall -9 mplayer
+#+ I Exec exec echo "quit" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
 # show/hyde the player GUI/menu
 # (alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet)
@@ -294,12 +295,17 @@
 DestroyFunc Playlist-generator-button
 AddToFunc Playlist-generator-button
 + I DestroyMenu recreate /Playlist-button
+Test (F /dev/dvb/adapter0/frontend0) + I AddToMenu /Playlist-button '$[gt.Select channel list]' PopUp /Preferences/MplayerChannelList
 + 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' Music-WatchDVB 1
+Test (F /dev/dvb/adapter0/frontend0) + I AddToMenu /Playlist-button '$[gt.Channels] DVB 1' PopUp /Music/ChannelSet1
 Test (F /dev/dvb/adapter1/frontend0) + I AddToMenu /Playlist-button '$[gt.Watch DVB] 2' Music-WatchDVB 2
+Test (F /dev/dvb/adapter1/frontend0) + I AddToMenu /Playlist-button '$[gt.Channels] DVB 2' PopUp /Music/ChannelSet2
 Test (F /dev/dvb/adapter2/frontend0) + I AddToMenu /Playlist-button '$[gt.Watch DVB] 3' Music-WatchDVB 3
+Test (F /dev/dvb/adapter3/frontend0) + I AddToMenu /Playlist-button '$[gt.Channels] DVB 3' PopUp /Music/ChannelSet3
 Test (F /dev/dvb/adapter3/frontend0) + I AddToMenu /Playlist-button '$[gt.Watch DVB] 4' Music-WatchDVB 4
+Test (F /dev/dvb/adapter3/frontend0) + I AddToMenu /Playlist-button '$[gt.Channels] DVB 4' PopUp /Music/ChannelSet4
 + 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
@@ -309,13 +315,18 @@
 + DynamicPopupAction Function Playlist-generator-button
 
 # mplayer
+Test (F /dev/dvb/adapter0/frontend0) Include preferences/MplayerChannelList1 
+Test (F /dev/dvb/adapter0/frontend0) Include preferences/MplayerChannelList2
+Test (F /dev/dvb/adapter0/frontend0) Include preferences/MplayerChannelList3
+Test (F /dev/dvb/adapter0/frontend0) Include preferences/MplayerChannelList4
+
 DestroyMenu /Playlist
 AddToMenu /Playlist
 + DynamicPopupAction Function /Playlist-generator
 
-DestroyMenu /Playlist-bot
-AddToMenu /Playlist-bot
-+ DynamicPopupAction Function /Playlist-generator-bot
+#DestroyMenu /Playlist-bot
+#AddToMenu /Playlist-bot
+#+ DynamicPopupAction Function /Playlist-generator-bot
 
 DestroyFunc /Playlist-generator
 AddToFunc /Playlist-generator
@@ -331,19 +342,19 @@
 + 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/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' Music-WatchDVB 1
-Test (F /dev/dvb/adapter2/frontend0) + I AddToMenu /Playlist-bot '$[gt.Watch DVB] 2' Music-WatchDVB 2
-Test (F /dev/dvb/adapter1/frontend0) + I AddToMenu /Playlist-bot '$[gt.Watch DVB] 3' Music-WatchDVB 3
-Test (F /dev/dvb/adapter0/frontend0) + I AddToMenu /Playlist-bot '$[gt.Watch DVB] 4' Music-WatchDVB 4
-#+ 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
+#DestroyFunc /Playlist-generator-bot
+#AddToFunc /Playlist-generator-bot
+#+ I DestroyMenu recreate /Playlist-bot
+#+ 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/adapter0/frontend0) + I AddToMenu /Playlist-bot '$[gt.Watch DVB] 1' Music-WatchDVB 1
+#Test (F /dev/dvb/adapter1/frontend0) + I AddToMenu /Playlist-bot '$[gt.Watch DVB] 2' Music-WatchDVB 2
+#Test (F /dev/dvb/adapter2/frontend0) + I AddToMenu /Playlist-bot '$[gt.Watch DVB] 3' Music-WatchDVB 3
+#Test (F /dev/dvb/adapter3/frontend0) + I AddToMenu /Playlist-bot '$[gt.Watch DVB] 4' Music-WatchDVB 4
+##+ 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
 
 DestroyFunc Music-WatchDVB
 AddToFunc Music-WatchDVB
@@ -351,26 +362,52 @@
 + I Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvb://$[0]@
 + I Exec exec echo "start" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
-### Comment me {{{1
+# DVD channels {{{1
 # The DVB linux support is messy. Some multituners (frontends) cards (adapters)
-# have their tuners grouped under the same fronted, other use different frontends,
+# have their tuners grouped under the same adapter, other use different adapter,
 # To make things worst, mplayer support only the first frontend of a given adapter,
 # and it can use an unique channel list file or several files.
-# So, dvb_set_channel <channel_number> <card_number> is not supported for now
-#DestroyFunc Music-ChannelSet
-#AddToFunc Music-ChannelSet
-#+ I Exec exec echo "dvb_set_channel $0 0" > /home/$[infostore.USERDIR]/.mplayer/pipe
+# If you are in the first case, you may want to define some custom udev rules.
+DestroyFunc Music-ChannelSet
+AddToFunc Music-ChannelSet
++ I Exec exec echo "dvb_set_channel $0 $1" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
-#DestroyFunc Channels-generator
-#AddToFunc Channels-generator
-#+ I DestroyMenu recreate /Music/ChannelSet
-#PipeRead 'i=0; while read line; do a=$(echo "$line" | sed -e \'s/\\([A-Za-z0-9 -_.]*\\).*/+ I AddToMenu \\/Music\\/ChannelSet "\\1"/\'); echo "$a Music-ChannelSet $i" ; i=$(($i+1)) ; done </home/dom/.mplayer/channels.conf.sat'
+DestroyFunc Channels-generator1
+AddToFunc Channels-generator1
++ I DestroyMenu recreate /Music/ChannelSet1
+Test (F /dev/dvb/adapter0/frontend0) PipeRead 'i=0; while read line; do a=$(echo "$line" | sed -e \'s/\\([A-Za-z0-9 -_.]*\\).*/+ I AddToMenu \\/Music\\/ChannelSet1 "\\1"/\'); echo "$a Music-ChannelSet $i 0" ; i=$(($i+1)) ; done <$[infostore.MplayerChannelList1]'
 
-#DestroyMenu /Music/ChannelSet
-#AddToMenu /Music/ChannelSet
-#+ DynamicPopupAction Function Channels-generator
-### End comment me {{{1
-#
+DestroyMenu /Music/ChannelSet1
+AddToMenu /Music/ChannelSet1
++ DynamicPopupAction Function Channels-generator1
+
+DestroyFunc Channels-generator2
+AddToFunc Channels-generator2
++ I DestroyMenu recreate /Music/ChannelSet2
+Test (F /dev/dvb/adapter1/frontend0) PipeRead 'i=0; while read line; do a=$(echo "$line" | sed -e \'s/\\([A-Za-z0-9 -_.]*\\).*/+ I AddToMenu \\/Music\\/ChannelSet2 "\\1"/\'); echo "$a Music-ChannelSet $i 1" ; i=$(($i+1)) ; done <$[infostore.MplayerChannelList2]'
+
+DestroyMenu /Music/ChannelSet2
+AddToMenu /Music/ChannelSet2
++ DynamicPopupAction Function Channels-generator2
+
+DestroyFunc Channels-generator3
+AddToFunc Channels-generator3
++ I DestroyMenu recreate /Music/ChannelSet3
+Test (F /dev/dvb/adapter2/frontend0) PipeRead 'i=0; while read line; do a=$(echo "$line" | sed -e \'s/\\([A-Za-z0-9 -_.]*\\).*/+ I AddToMenu \\/Music\\/ChannelSet3 "\\1"/\'); echo "$a Music-ChannelSet $i 2" ; i=$(($i+1)) ; done <$[infostore.MplayerChannelList3]'
+
+DestroyMenu /Music/ChannelSet3
+AddToMenu /Music/ChannelSet3
++ DynamicPopupAction Function Channels-generator3
+
+DestroyFunc Channels-generator4
+AddToFunc Channels-generator4
++ I DestroyMenu recreate /Music/ChannelSet4
+Test (F /dev/dvb/adapter4/frontend0) PipeRead 'i=0; while read line; do a=$(echo "$line" | sed -e \'s/\\([A-Za-z0-9 -_.]*\\).*/+ I AddToMenu \\/Music\\/ChannelSet4 "\\1"/\'); echo "$a Music-ChannelSet $i 3" ; i=$(($i+1)) ; done <$[infostore.MplayerChannelList4]'
+
+DestroyMenu /Music/ChannelSet4
+AddToMenu /Music/ChannelSet4
++ DynamicPopupAction Function Channels-generator4
+
 # mouse 2 Menu /Playback {{{2
 # alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms2
 DestroyFunc Music-Next
@@ -600,9 +637,11 @@
 + I AddToMenu /Music '$[gt.Mixer]' Popup /Mixer
 + I AddToMenu /Music '$[gt.Speed]' Popup /Speed
 + I AddToMenu /Music '$[gt.Show/Hide QJackCtl]' Music-QJackGUI
-### DVB channel change ### Comment me {{{1
-#+ I AddToMenu /Music 'Chaînes' PopUp /Music/ChannelSet
-### End Comment me
+# 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
+Test (F /dev/dvb/adapter2/frontend0) + I AddToMenu /Music '$[gt.Channels] DVB 3' PopUp /Music/ChannelSet3
+Test (F /dev/dvb/adapter3/frontend0) + I AddToMenu /Music '$[gt.Channels] DVB 4' PopUp /Music/ChannelSet4
 
 DestroyMenu /Music
 AddToMenu /Music

Modified: fvwm/components/functions/Music
===================================================================
--- fvwm/components/functions/Music	2013-04-24 17:36:01 UTC (rev 290)
+++ fvwm/components/functions/Music	2013-04-24 23:37:59 UTC (rev 291)
@@ -69,6 +69,12 @@
 # speed control (alsaplayer, mplayer) {{{2
 InfoStoreRemove speed
 
+# DVB channel lists (mplayer) {{{2
+InfoStoreRemove MplayerChannelList1
+InfoStoreRemove MplayerChannelList2
+InfoStoreRemove MplayerChannelList3
+InfoStoreRemove MplayerChannelList4
+
 # Decimal point in use (alsaplayer) {{{2
 InfoStoreRemove dec_point
 PipeRead 'if [[ $[infostore.MusicPlayer] == alsaplayer ]]; then echo "InfoStoreAdd dec_point `locale decimal_point`"; fi'

Modified: fvwm/components/functions/Preferences-Menu
===================================================================
--- fvwm/components/functions/Preferences-Menu	2013-04-24 17:36:01 UTC (rev 290)
+++ fvwm/components/functions/Preferences-Menu	2013-04-24 23:37:59 UTC (rev 291)
@@ -359,6 +359,39 @@
 + I SavePreferences DefaultMusicPlayer "InfoStoreAdd MusicPlayer $[infostore.MusicPlayer]"
 
 #
+# Mplayer DBD channels list
+#
+DestroyMenu /Preferences/MplayerChannelList
+AddToMenu /Preferences/MplayerChannelList
+Test (F /dev/dvb/adapter0/frontend0) + '%22x22/apps/mplayer.png%DVB 1' Module FvwmForm SelectChannelList-Dialog CARD=1
+Test (F /dev/dvb/adapter1/frontend0) + '%22x22/apps/mplayer.png%DVB 2' Module FvwmForm SelectChannelList-Dialog CARD=2
+Test (F /dev/dvb/adapter2/frontend0) + '%22x22/apps/mplayer.png%DVB 3' Module FvwmForm SelectChannelList-Dialog CARD=3
+Test (F /dev/dvb/adapter3/frontend0) + '%22x22/apps/mplayer.png%DVB 4' Module FvwmForm SelectChannelList-Dialog CARD=4
+
+DestroyFunc SelectMplayerChannelList
+AddToFunc SelectMplayerChannelList
++ I SavePreferences MplayerChannelList$[0] "InfoStoreAdd MplayerChannelList$[0] '$[1]'"
++ I InfoStoreAdd MplayerChannelList$[0] '$[1]'
+
+All (SelectChannelList-Dialog) Close
+DestroyModuleConfig Module SelectChannelList-Dialog: *
+*SelectChannelList-Dialog: Title "$[gt.Select channel list]"
+*SelectChannelList-Dialog: Text "$[gt.Enter the name of the channel list for the DVB input] $CARD"
+*SelectChannelList-Dialog: Line center
+*SelectChannelList-Dialog: Line center
+PipeRead 'echo "*SelectChannelList-Dialog: Text \\"$[gt.It must be in] /home/$(id -un)/.mplayer/\\""'
+*SelectChannelList-Dialog: Line center
+*SelectChannelList-Dialog: Line center
+PipeRead 'echo "*SelectChannelList-Dialog: Input file 40 \\"/home/$(id -un)/.mplayer/channels.conf\\""'
+*SelectChannelList-Dialog: Line center
+*SelectChannelList-Dialog: Line center
+*SelectChannelList-Dialog: Button quit " $[gt.Save] " ^M
+*SelectChannelList-Dialog: Command SelectMplayerChannelList $CARD "$(file)"
+*SelectChannelList-Dialog: Button quit " $[gt.No] " ^[
+*SelectChannelList-Dialog: Command Nop
+*SelectChannelList-Dialog: Line center
+
+#
 # Audio mixer
 #
 DestroyMenu /Preferences/Mixer

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