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

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

Revision: 229
          http://sourceforge.net/p/fvwm-crystal/code/229
Author:   dominique_libre
Date:     2013-04-12 22:09:07 +0000 (Fri, 12 Apr 2013)
Log Message:
-----------
functions/Music-audacious: +infostore variables => playlist localization

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

Modified: ChangeLog
===================================================================
--- ChangeLog	2013-04-12 21:46:36 UTC (rev 228)
+++ ChangeLog	2013-04-12 22:09:07 UTC (rev 229)
@@ -6,13 +6,14 @@
   for well know user directories
   scripts/make_all_playlists: use 4 variables for the playlists
   directories
-+ components/Media: common file for multimedia players
-  components/Music-mplayer(2): moved some functions to vomponents/Media;
++ functions/Media: common file for multimedia players
+  functions/Music-mplayer(2): moved some functions to vomponents/Media;
   introduced playlists localizations; playlist cleanup; clecup; 
   + playlist copy from crystal playlists to user playlists..
-  components/Music: playlist localization
-  components/Music-alsaplayer: playlist localization; add copy playlist
+  functions/Music: playlist localization
+  functios/Music-alsaplayer: playlist localization; add copy playlist
   function
+  functions/Music-audacious: +infostore variables => plalist localization
   
 Jeudi 11 Avril 2013 Dominique Michel
   FAQ: Added q.a. about tear off menus.

Modified: fvwm/components/functions/Music-audacious
===================================================================
--- fvwm/components/functions/Music-audacious	2013-04-12 21:46:36 UTC (rev 228)
+++ fvwm/components/functions/Music-audacious	2013-04-12 22:09:07 UTC (rev 229)
@@ -1,17 +1,14 @@
 # Support for Audacious in Fvwm-Crystal
 # Written by: Rafael Antonio Porras Samaniego <sp...@di...>
-# 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
-#######################
+# First button {{{1
+# Player controls and prefs
+# mouse 1 Menu /Player
 #DestroyFunc Music-Start
 #AddToFunc Music-Start
 #+ I Exec exec $0
@@ -36,21 +33,15 @@
 + I AddToMenu /Player '$[gt.Stop Audacious]' Exec exec killall -9 audacious
 + 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
 
-# Modifications, debugging and improvments by Dominique Michel
-# <dom...@so...>
-####################
-## 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
 DestroyFunc Music-RemoveSong
 AddToFunc Music-RemoveSong
 + I Exec exec audtool playlist-delete `audtool playlist-position`
@@ -59,7 +50,7 @@
 AddToFunc Music-RemovePlaylist-generator
 + I DestroyMenu recreate /Music/RemovePlaylist
 + I AddToMenu /Music/RemovePlaylist
-+ I PipeRead 'for i in $[NonManagedPlaylists]/*.{m3u,pls}; do \
++ I PipeRead 'for i in $[infostore.UserManagedAudioPlaylists]/*.{m3u,pls}; do \
   name=$(basename "$i"); \
   sname=${name%%.m3u}; \
   sname=${sname%%.pls}; \
@@ -95,8 +86,8 @@
 DestroyFunc FuncFvwmMenuAudioDirectory
 AddToFunc FuncFvwmMenuAudioDirectory
 + I PipeRead 'case "$0" in \
-	"$[AudioPlaylists]"*) myexec="audacious";; \
-	"$[UserManagedAudioPlaylists]"*) myexec="audacious";; \
+	"$[infostore.AudioPlaylists]"*) myexec="audacious";; \
+	"$[infostore.UserManagedAudioPlaylists]"*) myexec="audacious";; \
     esac; \
     test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
     test -f "$0"/.media.png && mypng="$0"/.media.png; \
@@ -109,8 +100,8 @@
 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.Audio playlists]' Popup $[infostore.AudioPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Personal audio playlists]' Popup $[infostore.UserManagedAudioPlaylists]
 
 DestroyFunc Music-ClearPlaylist
 AddToFunc Music-ClearPlaylist
@@ -177,14 +168,11 @@
 ## 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
 DestroyFunc Music-Volume
 AddToFunc Music-Volume
 + I Exec exec audtool set-volume $0
@@ -202,9 +190,7 @@
 + "-30 dB" Music-Volume '3'
 + " 0" Music-Volume '0'
 
-###############
-# Music menus #
-###############
+# Music menus {{{1
 # Recipe without audio buttons use the following:
 # Popup /Music
 DestroyFunc Music-generator

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