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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 209
          http://sourceforge.net/p/fvwm-crystal/code/209
Author:   dominique_libre
Date:     2013-04-10 16:35:14 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
functions/Music; functions/Music-mplayer: updated some variables to infostore (this will break the other players for now); updated to new playlist generation.

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

Modified: ChangeLog
===================================================================

--- ChangeLog	2013-04-10 16:29:34 UTC (rev 208)
+++ ChangeLog	2013-04-10 16:35:14 UTC (rev 209)
@@ -7,6 +7,8 @@
 - scripts/make_playlist: it is part of make_all_playlists now
   scipts/make_all_playlists: incorporation of make_playlist; updated
   to use parameters instead of environment variables.
+  components/Music; components/Music-mokayer: updated some variables
+  to infostore; updated to current make_all:playlists script.
 
 Mardi 9 Avril 2013 Dominique Michel
 

Modified: fvwm/components/functions/Music
===================================================================
--- fvwm/components/functions/Music	2013-04-10 16:29:34 UTC (rev 208)
+++ fvwm/components/functions/Music	2013-04-10 16:35:14 UTC (rev 209)
@@ -49,65 +49,52 @@
 ##          didn't changed it. We keep them or the user settings.          ##
 
  ###########################################################################
-# The playlists was previously in different places. They are now in 4 places:
-# 	~/PlaylistsAudio for the playlists of audio files,
-# 	~/PlaylistsVideo for the playlists of movie files and
-# 	~/Playlists/Audio for "by the user managed" audio playlists
-# 	~/Playlists/Video for "by the user managed" video playlists
+# The playlists was previously in different player dependant places.
+# They are now in 4 places:
+# 	~/Playlists/Audio for the playlists of audio files
+# 	~/Playlists/Video for the playlists of movie files
+# 	~/Playlists/User/Audio for "by the user managed" audio playlists
+# 	~/Playlists/User/Video for "by the user managed" video playlists
 #
-# 'Recreate the playlist' will manage ~/PlaylistsAudio and ~/PlaylistsVideo
+# 'Recreate the playlist' will manage ~/Playlists/Audio and ~/Playlists/Video
 # in a very simple way: delete all and recreate all.
 #
-# Todo: function AddFavorite (add a playlist from ~/PlaylistsAudio and
-#	~/PlaylistsVideo to the "by the user managed" playlists
+# Todo: function AddFavorite (add a playlist from ~/Playlists/Audio or
+#	~/Playlists/Video to the "by the user managed" playlists
 #
-# Note: according to /etc/xdg/iser-dirs.defaults, the default medias paths
+# Note: according to /etc/xdg/user-dirs.defaults, the default medias paths
 #	are $HOME/Music and $HOME/Videos and will be translated on a
 #	per-path-element basis into the users locale.
 #	TODO: 	centralize here the paths
 #		make them locale aware
-#
-# WARNING: I cannot test xmms anymore because it compile but just don't run for me.
-# 	In consequence, xmms support will be removed with the next release.
-###############################################################################
 
-###########
-## Mixer ##
-###########
+# Mixer {{{1
 Include components/functions/Mixer
 
-###############
-## Variables ##
-###############
-## Where are stored the playlists, needed in all cases (<=recereate playlists)
-Piperead 'echo SetEnv AudioPlaylists "/home/`id -un`/Playlists/Audio"'
-Piperead 'echo SetEnv VideoPlaylists "/home/`id -un`/Playlists/Video"'
-Piperead 'echo SetEnv UserManagedAudioPlaylists "/home/`id -un`/Playlists/User/Audio"'
-Piperead 'echo SetEnv UserManagedVideoPlaylists "/home/`id -un`/Playlists/User/Video"'
-## speed control ## (alsaplayer, mplayer)
+# Variables {{{1
+# playlists location, needed by recereate playlists {{{2
+PipeRead "echo InfoStoreAdd AudioPlaylists \\\"$HOME/Playlists/Audio\\\""
+PipeRead "echo InfoStoreAdd VideoPlaylists \\\"$HOME/Playlists/Video\\\""
+PipeRead "echo InfoStoreAdd UserManagedAudioPlaylists \\\"$HOME/Playlists/User/Audio\\\""
+PipeRead "echo InfoStoreAdd UserManagedVideoPlaylists \\\"$HOME/Playlists/User/Video\\\""
+# speed control (alsaplayer, mplayer) {{{2
 # player normal speed (We want normal speed)
 UnSetEnv speed
 Test (EnvMatch MusicPlayer alsaplayer) SetEnv speed "1"
 Test (EnvMatch MusicPlayer mplayer) SetEnv speed "1"
 Test (EnvMatch MusicPlayer mplayer2) SetEnv speed "1"
-# Decimal point in use
+# Decimal point in use {{{2
 UnSetEnv dec_point
 Test (EnvMatch MusicPlayer alsaplayer) PipeRead 'echo SetEnv dec_point `locale decimal_point`'
 Test (EnvMatch MusicPlayer mplayer) PipeRead 'echo SetEnv dec_point `locale decimal_point`'
-## We don't want player specific variables lying around
+# We don't want player specific variables lying around {{{2
 # mplayer(2)
-UnSetEnv USERDIR
-UnSetEnv fvwm_video_path
-UnSetEnv fvwm_video_path2
-UnSetEnv fvwm_video_path3
-UnSetEnv fvwm_video_path4
-UnSetEnv fvwm_dvd_path
 UnSetEnv fvwm_video_exec
+
 # xmms2
 UnSetEnv fvwm_audio_exec
 
-## Styles for media players windows
-###################################
+# Styles for media players windows {{{1
 Style Alsaplayer	NoActiveIconOverride, NoIcon, Sticky, WindowListSkip, StaysOnTop 
 Style alsaplayer	UseStyle Alsaplayer
 
@@ -129,10 +116,10 @@
 
 Style quodlibet		StaysOnTop, NoIcon, Sticky, WindowListSkip
 
-Style xmms		StaysOnTop
-Style XMMS_Player	StartIconic, NoIcon, !Title, Sticky, WindowListSkip
-Style XMMS_Playlist	UseStyle XMMS_Player
-Style XMMS_Equalizer	UseStyle XMMS_Player
+#Style xmms		StaysOnTop
+#Style XMMS_Player	StartIconic, NoIcon, !Title, Sticky, WindowListSkip
+#Style XMMS_Playlist	UseStyle XMMS_Player
+#Style XMMS_Equalizer	UseStyle XMMS_Player
 
 Style qjackctl		NoActiveIconOverride, NoIcon, Sticky, WindowListSkip
 
@@ -142,16 +129,15 @@
 ### change between the players.                          ###
 ############################################################
 
-###############################
-## First button              ##
-## Player controls and prefs ##
-###############################
-## mouse 1 Menu /Player
-#######################
+# First button {{{1
+# Player controls and prefs
+# mouse 1 Menu /Player {{{2
 # Recreate the playlists (all)
 DestroyFunc Music-RecreatePlaylist
 AddToFunc Music-RecreatePlaylist
-+ I Exec FvwmCommand 'A $[FVWM_SYSTEMDIR]/scripts/make_all_playlists $@'
+#+ I Exec FvwmCommand '
++ I A $[FVWM_USERDIR]/scripts/make_all_playlists $[infostore.AudioPlaylists] $[infostore.VideoPlaylists]
+#$@'
 
 # wrapper for cdcd
 DestroyFunc Music-cdcd
@@ -163,35 +149,32 @@
 # player quit (alsaplayer, mplayer)
 DestroyFunc Music-Kill
 
-# show/hyde the player GUI/menu (alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer,
-# quodlibet, xmms)
+# show/hyde the player GUI/menu
+# (alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet)
 DestroyFunc Music-GUI
 
-# Button menu (alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms)
+# Button menu
+# (alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet)
 DestroyFunc Player-generator
 # Button menu (all)
 DestroyMenu /Player
 AddToMenu /Player
 + DynamicPopupAction Function Player-generator
 
-## mouse 2 Music-GUI : allready here
-## mouse 3 Music-QJackGUI (all)
-#########################
+# mouse 2 Music-GUI : allready here {{{2
+# mouse 3 Music-QJackGUI (all)
 DestroyFunc Music-QJackGUI
 AddToFunc Music-QJackGUI
 + I All (qjackctl) Iconify toggle
 + I TestRc (NoMatch) Test (x qjackctl) Exec pidof qjackctl || exec qjackctl
 
-## mouse 4 Mixer-Volume-Up
-## mouse 5 Mixer-Volume-Down
-## are in components/Mixer
+# mouse 4 Mixer-Volume-Up {{{2
+# 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
 # Load all the songs (mpd)
 DestroyFunc Music-LoadAll
 
@@ -208,23 +191,23 @@
 
 # Load playlist (alsaplayer, audacious, mocp, mplayer)
 DestroyFunc FuncFvwmMenuAudioDirectory
-# Load playlist (mpd, xmms, xmms2)
+# Load playlist (mpd, xmms2)
 DestroyFunc Music-LoadPlaylist-generator
-# Load playlist (alsaplayer, audacious, mocp, mpd, mplayer, xmms, xmms2)
+# Load playlist (alsaplayer, audacious, mocp, mpd, mplayer, xmms2)
 DestroyMenu /Music/LoadPlaylist
 
-# Clear playlist (alsaplayer, audacious, mocp, mpd, xmms, xmms2)
+# Clear playlist (alsaplayer, audacious, mocp, mpd, xmms2)
 DestroyFunc Music-ClearPlaylist
 
-# Remove song (audacious, mpd, xmms, xmms2)
+# Remove song (audacious, mpd, xmms2)
 DestroyFunc Music-RemoveSong
 
-# Remove playlist (alsaplayer, audacious, mocp, mpd, mplayer, xmms, xmms2)
+# Remove playlist (alsaplayer, audacious, mocp, mpd, mplayer, xmms2)
 DestroyFunc Music-RemovePlaylist-generator
 DestroyFunc FuncFvwmMenuRemovePlaylistDirectory (alsaplayer)
 DestroyMenu /Music/RemovePlaylist
 
-# Save playlist dialog (audacious, mpdm, xmms, xmms2)
+# Save playlist dialog (audacious, mpdm, xmms2)
 All (Music-SavePlaylist-Dialog) Close
 DestroyModuleConfig Music-SavePlaylist-Dialog: *
 DestroyFunc Music-SavePlaylist
@@ -236,41 +219,40 @@
 # Update the database (mpd)
 DestroyFunc Music-Update
 
-# button menu (alsaplayer, audacious, mocp, mpd, mplayer, xmms, xmms2)
+# button menu (alsaplayer, audacious, mocp, mpd, mplayer, xmms2)
 DestroyFunc Playlist-generator-button
 DestroyMenu /Playlist-button
 
-## mouse 2 Menu /Playback
-#########################
-# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms, xmms2
+# mouse 2 Menu /Playback {{{2
+# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms2
 DestroyFunc Music-Next
 
-# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms, xmms2
+# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms2
 DestroyFunc Music-Prev
 
 # alsaplayer
 DestroyFunc Music-SongChange
 DestroyMenu /Music/SongChange
 
-# alsaplayer, audacious, cdcd, cmus, mocp, mpd, quodlibet, xmms, xmms2
+# alsaplayer, audacious, cdcd, cmus, mocp, mpd, quodlibet, xmms2
 DestroyFunc Music-Stop
 
-# alsaplayer, audacious, cdcd, cmus, mocp, mpd, quodlibet, xmms, xmms2
+# alsaplayer, audacious, cdcd, cmus, mocp, mpd, quodlibet, xmms2
 DestroyFunc Music-Play
 
-# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms, xmms2
+# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms2
 DestroyFunc Music-Pause
 
-# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer (button 3), quodlibet, xmms
+# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer (button 3), quodlibet
 DestroyFunc Music-PlayPause
 
-# cdcd, cmus, mpd, quodlibet, xmms
+# cdcd, cmus, mpd, quodlibet
 DestroyFunc Music-Forward
 
-# cdcd, cmus, mpd, quodlibet, xmms
+# cdcd, cmus, mpd, quodlibet
 DestroyFunc Music-Backward
 
-# audacious, cmus, mpd, quodlibet, xmms
+# audacious, cmus, mpd, quodlibet
 DestroyFunc Music-ToggleRandom
 
 # alsaplayer, mplayer
@@ -287,29 +269,23 @@
 # mpd, xmms2
 DestroyFunc Music-Shuffle
 
-# xmms
-DestroyFunc Music-Find
-
-# button menu (alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, mocp, mpd, mplayer,
-# quodlibet, xmms2)
+# button menu
+# (alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, mocp, mpd, mplayer, quodlibet, xmms2)
 DestroyFunc Playback-generator
 # button menu (all)
 DestroyMenu /Playback
 AddToMenu /Playback
 + DynamicPopupAction Function Playback-generator
 
-## 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 : allready here
-## mouse 3 Menu /Music/Volume
-#############################
+# Third button {{{1
+# Player controls and vol
+# mouse 1 Music-Pause : allready here {{{2
+# mouse 2 Music-PlayPause : allready here
+# mouse 3 Menu /Music/Volume
 # alsaplayer
 DestroyFunc Music-VolumeFr
 DestroyFunc Music-VolumeEn
@@ -319,40 +295,32 @@
 # button menu (alsaplayer, mplayer)
 DestroyMenu /Music/Volume
 
-## mouse 4 Music-Speed-Up
-## mouse 5 Music-Speed-Down
-###########################
+# mouse 4 Music-Speed-Up {{{2
+# mouse 5 Music-Speed-Down
 # alsaplayer, mplayer
 DestroyFunc Music-Speed-Up
 DestroyFunc Music-Speed-Down
 
-##################
-## Last button ###
-## speed controls ##
-####################
-## mouse 1 Menu /Speed
-######################
+# Last button {{{1
+# speed controls
+# mouse 1 Menu /Speed {{{2
 # alsaplayer, mplayer
 DestroyFunc Music-Speed
 # button menu (alsaplayer, mplayer)
 DestroyMenu /Speed
 
-## mouse 4 Button-Seek-+
-## mouse 5 Button-Seek--
-########################
+# mouse 4 Button-Seek-+ {{{2
+# mouse 5 Button-Seek--
 # alsaplayer
 DestroyFunc Button-Seek-+
 DestroyFunc Button-Seek--
 
-###############
-# Music menus #
-###############
-# main music menu (alsaplayer, audacious, mocp)
+# Music menus {{{1
+# main music menu (alsaplayer, audacious, mocp) {{{2
 DestroyFunc Music-generator
 
 DestroyMenu /Music
 AddToMenu /Music
 + DynamicPopupAction Function Music-generator
 
-
 # vim:ft=fvwm

Modified: fvwm/components/functions/Music-mplayer
===================================================================
--- fvwm/components/functions/Music-mplayer	2013-04-10 16:29:34 UTC (rev 208)
+++ fvwm/components/functions/Music-mplayer	2013-04-10 16:35:14 UTC (rev 209)
@@ -1,31 +1,17 @@
 # Support for MPlayer media player into Fvwm-Crystal
-# Written by: Dominique Michel <dom...@so...>
+# Written by: Dominique Michel <dom...@so...> 2008-2013
 
-# TODO : support for recording
-
-# Initialisations, shared functions
+# Load shared functions and initialisations {{{1 
 Include components/functions/Music
 
-#############
-# Variables #
-#############
+# Specific variables {{{1
 # We must start mplayer in slave mode and send the commands via a pipe
 # Create the pipe if it doesn't exist:
-Piperead 'echo SetEnv USERDIR `id -un`'
-Test (!F /home/$[USERDIR]/.mplayer/pipe) PipeRead 'mkfifo /home/$[USERDIR]/.mplayer/pipe'
+Piperead 'echo InfoStoreAdd USERDIR `id -un`'
+Test (!F /home/$[infostore.USERDIR]/.mplayer/pipe) PipeRead 'mkfifo /home/$[infostore.USERDIR]/.mplayer/pipe'
 
-# The following variables are used by FvwmMenuDirectory; 
-# it doesn't follow symlinks but it follow sub-directories.
-SetEnv fvwm_video_path "/mnt/usb3/Movies"
-SetEnv fvwm_video_path2 "/mnt/usb3/Musique"
-SetEnv fvwm_video_path3 "/mnt/usb23/dom/movies"
-SetEnv fvwm_video_path4 "/mnt/work/dom/Movies"
-#SetEnv fvwm_video_path "/home/$[USERDIR]/movies"
-#SetEnv fvwm_dvd_path "/media/hdc"
-SetEnv fvwm_dvd_path "/mnt/cdrom2"
-
 # Command line for FvwmMenuDirectory media browser
-SetEnv fvwm_video_exec "fvwm-crystal.mplayer-wrapper file $USERDIR"
+SetEnv fvwm_video_exec "fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR]"
 
 ###################
 ## First button ###
@@ -39,16 +25,18 @@
 
 DestroyMenu /Music/Start
 AddToMenu /Music/Start
-+ '$[gt.Start MPlayer]' Music-Start "mplayer -ao jack, -menu -fs -fixed-vo -slave -idle -input file=/home/$[USERDIR]/.mplayer/pipe"
+#+ '$[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"
 
 DestroyFunc Music-Kill
 AddToFunc Music-Kill
-+ I Exec exec echo "quit" > /home/$[USERDIR]/.mplayer/pipe
+# + I Exec exec echo "quit" > /home/$[infostore.USERDIR]/.mplayer/pipe
++ I Exec exec killall -9 mplayer
 
 DestroyFunc Music-GUI
 AddToFunc Music-GUI
-+ I Exec exec echo "menu up" > /home/$[USERDIR]/.mplayer/pipe
++ I Exec exec echo "menu up" > /home/$[infostore.USERDIR]/.mplayer/pipe
 + I All (XDRadio) Iconify toggle
 
 DestroyFunc Player-generator
@@ -78,43 +66,19 @@
 ################################
 DestroyFunc Load-DVD
 AddToFunc Load-DVD
-+ I Exec exec fvwm-crystal.mplayer-wrapper dvd $[USERDIR]
++ I Exec exec fvwm-crystal.mplayer-wrapper dvd $[infostore.USERDIR]
 
-# From Taviso's configuration
-# 22x22/categories/Audio-Video.png will be used for all the files that doesn't have a .media.png inside their directory
-# 22x22/categories/directory.png will be used for all the directories that doesn't have a .icontitle.png file
-DestroyFunc FuncFvwmMenuMovieDirectory
-AddToFunc FuncFvwmMenuMovieDirectory
-+ I PipeRead 'case "$0" in \
-	"$[fvwm_video_path]"*) myexec="$[fvwm_video_exec]";; \
-	"$[fvwm_video_path2]"*) myexec="$[fvwm_video_exec]";; \
-	"$[fvwm_video_path3]"*) myexec="$[fvwm_video_exec]";; \
-	"$[fvwm_video_path4]"*) myexec="$[fvwm_video_exec]";; \
-	"$[fvwm_dvd_path]"*) myexec="$[fvwm_video_exec]";; \
-    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-Video.png}" \
-      --func="FuncFvwmMenuMovieDirectory" \
-      --exec-file "^${myexec}" --dir "$0" --exec-t="^fvwm-crystal.play-movies $0"'
-# put one popup line per path :
-DestroyMenu /Music/LoadMovie
-AddToMenu /Music/LoadMovie
-+ MissingSubmenuFunction FuncFvwmMenuMovieDirectory
-+ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[fvwm_video_path]
-+ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[fvwm_video_path2]
-+ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[fvwm_video_path3]
-+ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[fvwm_video_path4]
-+ '%22x22/categories/video_movies_view.png%$[gt.Browse DVD]' Popup $[fvwm_dvd_path]
+# Generate /Music/LoadMovie menu
+PipeRead '$[FVWM_SYSTEMDIR]/scripts/media_directories'
+Include tmp/MenuMovieDirectory
 
 DestroyFunc FuncFvwmMenuAudioDirectory
 AddToFunc FuncFvwmMenuAudioDirectory
 + I PipeRead 'case "$0" in \
-	"$[AudioPlaylists]"*) myexec="fvwm-crystal.mplayer-wrapper list $USERDIR";; \
-	"$[UserManagedAudioPlaylists]"*) myexec="fvwm-crystal.mplayer-wrapper list $USERDIR";; \
-	"$[VideoPlaylists]"*) myexec="fvwm-crystal.mplayer-wrapper list $USERDIR";; \
-	"$[UserManagedVideoPlaylists]"*) myexec="fvwm-crystal.mplayer-wrapper list $USERDIR";; \
+	"$[infostore.AudioPlaylists]"*) myexec="fvwm-crystal.mplayer-wrapper list $[infostore.USERDIR]";; \
+	"$[infostore.UserManagedAudioPlaylists]"*) myexec="fvwm-crystal.mplayer-wrapper list $[infostore.USERDIR]";; \
+	"$[infostore.VideoPlaylists]"*) myexec="fvwm-crystal.mplayer-wrapper list $[infostore.USERDIR]";; \
+	"$[infostore.UserManagedVideoPlaylists]"*) myexec="fvwm-crystal.mplayer-wrapper list $[infostore.USERDIR]";; \
     esac; \
     test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
     test -f "$0"/.media.png && mypng="$0"/.media.png; \
@@ -127,16 +91,16 @@
 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]
-+ '%22x22/categories/video_movies_view.png%$[gt.Video playlists]' Popup $[VideoPlaylists]
-+ '%22x22/categories/video_movies_view.png%$[gt.Personal video playlists]' Popup $[UserManagedVideoPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Audio playlists]' Popup $[infostore.AudioPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Video playlists]' Popup $[infostore.VideoPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Personal audio playlists]' Popup $[infostore.UserManagedAudioPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Personal video playlists]' Popup $[infostore.UserManagedVideoPlaylists]
 
 DestroyFunc Music-RemovePlaylist-generator
 AddToFunc Music-RemovePlaylist-generator
 + I DestroyMenu recreate /Music/RemovePlaylist
 + I AddToMenu /Music/RemovePlaylist
-+ I PipeRead 'for i in $[UserManagedAudioPlaylists]/*.{m3u,pls}; do \
++ I PipeRead 'for i in $[infostore.UserManagedAudioPlaylists]/*.{m3u,pls}; do \
   name=$(basename "$i"); \
   sname=${name%%.m3u}; \
   sname=${sname%%.pls}; \
@@ -162,24 +126,24 @@
 #########################
 DestroyFunc Music-Pause
 AddToFunc Music-Pause
-+ I Exec exec echo "pause" > /home/$[USERDIR]/.mplayer/pipe
++ I Exec exec echo "pause" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
 # Todo
 DestroyFunc Music-FrameStep
 AddToFunc Music-FrameStep
-+ I Exec exec echo "frame_step" > /home/$[USERDIR]/.mplayer/pipe
++ 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/$[USERDIR]/.mplayer/pipe
++ 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/$[USERDIR]/.mplayer/pipe
++ 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/$[USERDIR]/.mplayer/pipe
++ I Exec exec echo "seek $0 1" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
 DestroyMenu /Music/Jump
 AddToMenu /Music/Jump
@@ -196,7 +160,7 @@
 
 DestroyFunc Music-Seek
 AddToFunc Music-Seek
-+ I Exec exec echo "seek $0 0" > /home/$[USERDIR]/.mplayer/pipe
++ I Exec exec echo "seek $0 0" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
 DestroyMenu /Music/Seek
 AddToMenu /Music/Seek
@@ -244,13 +208,13 @@
 ## mouse 2 Music-PlayPause
 DestroyFunc Music-PlayPause
 AddToFunc Music-PlayPause
-+ I Exec exec echo "frame_step" > /home/$[USERDIR]/.mplayer/pipe
++ I Exec exec echo "frame_step" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
 ## mouse 3 Menu /Music/Volume
 #############################
 DestroyFunc Music-Volume
 AddToFunc Music-Volume
-+ I Exec exec echo "volume $0 1" > /home/$[USERDIR]/.mplayer/pipe
++ I Exec exec echo "volume $0 1" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
 DestroyMenu /Music/Volume
 AddToMenu /Music/Volume
@@ -270,14 +234,14 @@
 DestroyFunc Music-Speed-Up
 AddToFunc Music-Speed-Up
 + I PipeRead 'echo SetEnv speed `$[FVWM_SYSTEMDIR]/scripts/speed_value +1comma mplayer`'
-+ I Exec exec echo "speed_set $[speed]" > /home/$[USERDIR]/.mplayer/pipe
++ I Exec exec echo "speed_set $[speed]" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
 ## mouse 5 Music-Speed-Down
 ###########################
 DestroyFunc Music-Speed-Down
 AddToFunc Music-Speed-Down
 + I PipeRead 'echo SetEnv speed `$[FVWM_SYSTEMDIR]/scripts/speed_value -1comma mplayer`'
-+ I Exec exec echo "speed_set $[speed]" > /home/$[USERDIR]/.mplayer/pipe
++ I Exec exec echo "speed_set $[speed]" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
 ##################
 ## Last button ###
@@ -288,7 +252,7 @@
 DestroyFunc Music-Speed
 AddToFunc Music-Speed
 + I PipeRead 'echo SetEnv speed `$[FVWM_SYSTEMDIR]/scripts/speed_value $0 mplayer`'
-+ I Exec exec echo "speed_set $[speed]" > /home/$[USERDIR]/.mplayer/pipe
++ I Exec exec echo "speed_set $[speed]" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
 # speed_set <0.01 to 100>
 DestroyMenu /Speed
@@ -330,11 +294,11 @@
 
 DestroyFunc Music-VolumeUp
 AddToFunc Music-VolumeUp
-+ I Exec exec echo "volume 10 0" > /home/$[USERDIR]/.mplayer/pipe
++ 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/$[USERDIR]/.mplayer/pipe
++ I Exec exec echo "volume -10 0" > /home/$[infostore.USERDIR]/.mplayer/pipe
 
 #------------------------------------------------------------------
 # Basic menus
@@ -342,7 +306,7 @@
 # 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/$[USERDIR]/.mplayer/pipe"
+#+ '$[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
 

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





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

FVWM-Crystal aims to create an easy to use and powerful desktop.

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