Menu
▾
▴
[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[235] fvwm/components/functions
|
From: <dom...@us...> - 2013-04-14 17:07:21
|
Revision: 235
http://sourceforge.net/p/fvwm-crystal/code/235
Author: dominique_libre
Date: 2013-04-14 17:07:14 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
cleanup
Modified Paths:
--------------
fvwm/components/functions/Media
fvwm/components/functions/Music
fvwm/components/functions/Music-alsaplayer
fvwm/components/functions/Music-audacious
fvwm/components/functions/Music-cdcd
Modified: fvwm/components/functions/Media
===================================================================
--- fvwm/components/functions/Media 2013-04-13 19:44:57 UTC (rev 234)
+++ fvwm/components/functions/Media 2013-04-14 17:07:14 UTC (rev 235)
@@ -2,10 +2,9 @@
# initialisations and some shared functions
# Written by: Dominique Michel <dom...@us...>
#
-# TODO: This file must be included at the top of the multimedia player control files.
-# Include components/functions/MediaButtons
+# This file must be included at the top of the multimedia player control files.
+# Include components/functions/Media
#
-# Some recipes do have a media button, the other do have a menu.
# Recipes with media button: Amiga, Corner, Default, Default with ACPI, Dock
# The bindings of the media buttons are:
#
@@ -65,7 +64,7 @@
InfoStoreAdd UserManagedVideoPlaylists "$[HOME]/Playlists/Video"
# speed control (alsaplayer, mplayer) {{{2
-# player normal speed (We want normal speed)
+# (TODO: 1 variable per player)
InfoStoreAdd speed 1
# Decimal point in use {{{2
@@ -344,7 +343,7 @@
# audacious, mplayer
DestroyFunc Music-Volume
-# button menu (alsaplayer, mplayer)
+# button menu (alsaplayer, audacious, mplayer)
DestroyMenu /Music/Volume
# mouse 4 Music-Speed-Up {{{2
Modified: fvwm/components/functions/Music
===================================================================
--- fvwm/components/functions/Music 2013-04-13 19:44:57 UTC (rev 234)
+++ fvwm/components/functions/Music 2013-04-14 17:07:14 UTC (rev 235)
@@ -3,7 +3,7 @@
# Written by: Dominique Michel <dom...@us...>
#
# This file must be included at the top of the music player control files.
-# Include components/functions/MediaButtons
+# Include components/functions/Music
#
# Some recipes do have a media button, the other do have a menu.
# Recipes with media button: Amiga, Corner, Default, Default with ACPI, Dock
@@ -67,10 +67,10 @@
InfoStoreAdd UserManagedVideoPlaylists "$[HOME]/Playlists/Video"
# speed control (alsaplayer, mplayer) {{{2
-# player normal speed (We want normal speed)
-InfoStoreAdd speed 1
+InfoStoreRemove speed
-# Decimal point in use {{{2
+# Decimal point in use (alsaplayer) {{{2
+InfoStoreRemove dec_point
PipeRead 'if [[ $[MusicPlayer] == alsaplayer ]]; then echo "InfoStoreAdd dec_point `locale decimal_point`"; fi'
# xmms2
@@ -105,23 +105,13 @@
Style qjackctl NoActiveIconOverride, NoIcon, Sticky, WindowListSkip
-############################################################
-### We don't want player specific functions lying around ###
-### otherwise, we put here the functions that doesn't ###
-### change between the players. ###
-############################################################
-
-# First button {{{1
-# Player controls and prefs
-# mouse 1 Menu /Player {{{2
+# Functions {{{1
+# menu /Player {{{2
# Recreate the playlists (all)
DestroyFunc Music-RecreatePlaylist
AddToFunc Music-RecreatePlaylist
+ I A $[FVWM_SYSTEMDIR]/scripts/make_all_playlists $[infostore.AudioPlaylists] $[infostore.VideoPlaylists] $[infostore.UserManagedAudioPlaylists] $[infostore.UserManagedVideoPlaylists]
-# wrapper for cdcd
-DestroyFunc Music-cdcd
-
# start the player(s) (alsaplayer, mplayer)
DestroyFunc Music-Start
DestroyMenu /Music/Start
@@ -129,60 +119,17 @@
# player quit (alsaplayer, mplayer)
DestroyFunc Music-Kill
-# show/hyde the player GUI/menu
-# (alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet)
+# 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)
-DestroyFunc Player-generator
-# Button menu (all)
-DestroyMenu /Player
-AddToMenu /Player
-+ DynamicPopupAction Function Player-generator
+# wrapper for cdcd
+DestroyFunc Music-cdcd
-# 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 {{{2
-# mouse 5 Mixer-Volume-Down
-# are in components/Mixer
-
# Second button {{{1
# Player controls and main vol
# mouse 1 Menu /Playlist-button {{{2
-# Load all the songs (mpd)
-DestroyFunc Music-LoadAll
-# Play DVD (mplayer)
-DestroyFunc Load-DVD
-
-# Show current playlist (xmms2)
-DestroyFunc Music-CurrentPlaylist-generator
-DestroyMenu /Music/CurrentPlaylist
-
-# Load movie playlist (mplayer)
-DestroyFunc FuncFvwmMenuMovieDirectory
-DestroyMenu /Music/LoadMovie
-
-# Load playlist (alsaplayer, audacious, mocp, mplayer)
-DestroyFunc FuncFvwmMenuAudioDirectory
-# Load playlist (mpd, xmms2)
-DestroyFunc Music-LoadPlaylist-generator
-# Load playlist (alsaplayer, audacious, mocp, mpd, mplayer, xmms2)
-DestroyMenu /Music/LoadPlaylist
-
-# Clear playlist (alsaplayer, audacious, mocp, mpd, xmms2)
-DestroyFunc Music-ClearPlaylist
-
-# Remove song (audacious, mpd, xmms2)
-DestroyFunc Music-RemoveSong
-
-# Remove playlist (alsaplayer, audacious, mocp, mpd, mplayer, xmms2)
+# Remove playlist (all)
DestroyFunc Music-RemovePlaylist-generator
AddToFunc Music-RemovePlaylist-generator
+ I DestroyMenu recreate /Music/RemovePlaylist
@@ -197,23 +144,8 @@
AddToMenu /Music/RemovePlaylist
+ DynamicPopupAction Function Music-RemovePlaylist-generator
-# Save playlist dialog (audacious, mpdm, xmms2)
-All (Music-SavePlaylist-Dialog) Close
-DestroyModuleConfig Music-SavePlaylist-Dialog: *
-DestroyFunc Music-SavePlaylist
-
-# Add playlist (xmms2)
-DestroyFunc FuncFvwmMenuPlaylistDirectory
-DestroyMenu /Music/LoadPlaylist
-
-# Update the database (mpd)
-DestroyFunc Music-Update
-
-# Load Media Playlists (mplayer)
-DestroyFunc FuncFvwmMenuMediaDirectory
-DestroyMenu /Music/LoadMediaPlaylist
-
-# Copy playlist (alsaplayer, audacious, mplayer)
+# Copy playlist (all)
+# Note: Visualy redundant; TODO: A recursive generator like in remove playlist
DestroyFunc FuncFvwmMenuCopyPlaylistDirectory
AddToFunc FuncFvwmMenuCopyPlaylistDirectory
+ I PipeRead 'case "$0" in \
@@ -232,17 +164,50 @@
+ MissingSubmenuFunction FuncFvwmMenuCopyPlaylistDirectory
+ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[infostore.AudioPlaylists]
-# button menu (alsaplayer, audacious, mocp, mpd, mplayer, xmms2)
-DestroyFunc Playlist-generator-button
-DestroyMenu /Playlist-button
+# Clear playlist (alsaplayer, audacious, mocp, mpd, xmms2)
+DestroyFunc Music-ClearPlaylist
-# mouse 2 Menu /Playback {{{2
-# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms2
-DestroyFunc Music-Next
+# Load movie playlist (mplayer)
+DestroyFunc FuncFvwmMenuMovieDirectory
+DestroyMenu /Music/LoadMovie
+# Load Media Playlists (mplayer)
+DestroyFunc FuncFvwmMenuMediaDirectory
+DestroyMenu /Music/LoadMediaPlaylist
+# Load playlist (alsaplayer, audacious, mocp, mplayer)
+DestroyFunc FuncFvwmMenuAudioDirectory
+# Add playlist (xmms2)
+DestroyFunc FuncFvwmMenuPlaylistDirectory
+# Load playlist (mpd, xmms2)
+DestroyFunc Music-LoadPlaylist-generator
+# Load playlist (alsaplayer, audacious, mocp, mpd, mplayer, xmms2)
+DestroyMenu /Music/LoadPlaylist
+AddToMenu /Music/LoadPlaylist
++ '$[gt.Choose playlist to load]' Nop
++ MissingSubmenuFunction FuncFvwmMenuAudioDirectory
++ '%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]
-# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms2
-DestroyFunc Music-Prev
+# Load all the songs (mpd)
+DestroyFunc Music-LoadAll
+# Play DVD (mplayer)
+DestroyFunc Load-DVD
+
+# Show current playlist (xmms2)
+DestroyFunc Music-CurrentPlaylist-generator
+DestroyMenu /Music/CurrentPlaylist
+
+# Remove song (audacious, mpd, xmms2)
+DestroyFunc Music-RemoveSong
+
+# Save playlist dialog (audacious, mpdm, xmms2)
+All (Music-SavePlaylist-Dialog) Close
+DestroyModuleConfig Music-SavePlaylist-Dialog: *
+DestroyFunc Music-SavePlaylist
+
+# Update the database (mpd)
+DestroyFunc Music-Update
+
# alsaplayer
DestroyFunc Music-SongChange
DestroyMenu /Music/SongChange
@@ -250,12 +215,6 @@
# alsaplayer, audacious, cdcd, cmus, mocp, mpd, quodlibet, xmms2
DestroyFunc Music-Stop
-# 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, quodlibet
DestroyFunc Music-PlayPause
@@ -272,55 +231,23 @@
DestroyFunc Music-Jump
DestroyMenu /Music/Jump
-# alsaplayer, mplayer
-DestroyFunc Music-Seek
-DestroyMenu /Music/Seek
-
# mpd
DestroyMenu /Music/Crossfade
# mpd, xmms2
DestroyFunc Music-Shuffle
-# 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 {{{2
-# mouse 4 Music-Next : allready here
-# mouse 4 Music-Prev : allready here
-
-# Third button {{{1
-# Player controls and vol
-# mouse 1 Music-Play : allready here {{{2
-# mouse 2 Music-Pause : allready here
-# mouse 3 Menu /Music/Volume
# alsaplayer
DestroyFunc Music-VolumeFr
DestroyFunc Music-VolumeEn
# audacious, mplayer
DestroyFunc Music-Volume
-# button menu (alsaplayer, mplayer)
-DestroyMenu /Music/Volume
-
-# mouse 4 Music-Speed-Up {{{2
-# mouse 5 Music-Speed-Down
# alsaplayer, mplayer
-DestroyFunc Music-Speed-Up
-DestroyFunc Music-Speed-Down
-
-# 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-+ {{{2
# mouse 5 Button-Seek--
@@ -329,11 +256,78 @@
DestroyFunc Button-Seek--
# Music menus {{{1
-# main music menu (alsaplayer, audacious, mocp) {{{2
+# main music menu (alsaplayer, audacious, cdcd, mocp) {{{2
DestroyFunc Music-generator
DestroyMenu /Music
AddToMenu /Music
+ DynamicPopupAction Function Music-generator
+# Button menus {{{1
+# # # # # # # # # #
+# Button 1 mouse 1 {{{2
+# (alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet)
+DestroyFunc Player-generator
+# Button menu (all)
+DestroyMenu /Player
+AddToMenu /Player
++ DynamicPopupAction Function Player-generator
+
+# Button 1 mouse 3 {{{2
+DestroyFunc Music-QJackGUI
+AddToFunc Music-QJackGUI
++ I All (qjackctl) Iconify toggle
++ I TestRc (NoMatch) Test (x qjackctl) Exec pidof qjackctl || exec qjackctl
+
+# Button 1 mouse 4 {{{2
+# Mixer-Volume-Up in components/Mixer
+# Button 1 mouse 5
+# Mixer-Volume-Down in components/Mixer
+
+# Button 2 mouse 1 {{{1
+# button menu (alsaplayer, audacious, mocp, mpd, mplayer, xmms2)
+DestroyFunc Playlist-generator-button
+DestroyMenu /Playlist-button
+
+# Button 2 mouse 2 (alsaplayer, audacious, mplayer) {{{2
+DestroyMenu /Music/Volume
+
+# Button 2 mouse 3 {{{2
+# /Mixer : in components/Mixer
+
+# Button 2 mouse 4 {{{2
+# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms2
+DestroyFunc Music-Next
+
+# Button 2 mouse 5 {{{2
+# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms2
+DestroyFunc Music-Prev
+
+# Button 3 mouse 1 {{{1
+# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms2
+DestroyFunc Music-Play
+
+# Button 3 mouse 2 {{{2
+# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms2
+DestroyFunc Music-Pause
+
+# Button 3 mouse 3 (all) {{{2
+DestroyMenu /Playback
+AddToMenu /Playback
++ DynamicPopupAction Function Playback-generator
+
+# Button 3 mouse 4 (alsaplayer, mplayer) {{{2
+DestroyFunc Music-Speed-Up
+# Button 3 mouse 4 (alsaplayer, mplayer) {{{2
+DestroyFunc Music-Speed-Down
+
+# Button 4 mouse 1 (alsaplayer, mplayer) {{{1
+DestroyMenu /Speed
+
+# Button 4 mouse 4 (alsaplayer, mplayer ) {{{2
+# Button 4 mouse 5
+DestroyFunc Music-Seek
+DestroyMenu /Music/Seek
+
+
# vim:ft=fvwm
Modified: fvwm/components/functions/Music-alsaplayer
===================================================================
--- fvwm/components/functions/Music-alsaplayer 2013-04-13 19:44:57 UTC (rev 234)
+++ fvwm/components/functions/Music-alsaplayer 2013-04-14 17:07:14 UTC (rev 235)
@@ -1,32 +1,31 @@
# Support for Alsaplayer in Fvwm-Crystal
# Written by: Dominique Michel <dom...@us...> 2008-2013
+# See ChangeLog for details
# Initialisations, shared functions {{{1
Include components/functions/Music
+# Alsaplayer normal speed
+InfoStoreAdd speed 1
+
# First button {{{1
# Player controls and prefs
# mouse 1 Menu /Player {{{2
# Recreate the playlists : in Music
-DestroyFunc Music-Start
AddToFunc Music-Start
+ I Exec exec $0
-DestroyMenu /Music/Start
AddToMenu /Music/Start
+ "Alsa" Music-Start "alsaplayer -o alsa -s alsa"
+ "Jack" Music-Start "alsaplayer -o jack -F 48000 -s Alsaplayer"
-DestroyFunc Music-Kill
AddToFunc Music-Kill
+ I Exec exec alsaplayer --quit
-DestroyFunc Music-GUI
AddToFunc Music-GUI
+ I All (alsaplayer) Iconify toggle
# Player-generator (All)
-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
@@ -47,7 +46,8 @@
# Second button {{{1
# Player controls and main vol
# mouse 1 Menu /Playlist-button {{{2
-DestroyFunc FuncFvwmMenuAudioDirectory
+
+# /Music/LoadPlaylist
AddToFunc FuncFvwmMenuAudioDirectory
+ I PipeRead 'case "$0" in \
"$[infostore.AudioPlaylists]"*) myexec="alsaplayer -e";; \
@@ -60,44 +60,29 @@
--dir "$0" --exec-title "-" --exec-file "^${myexec}" \
--func-name "FuncFvwmMenuAudioDirectory"'
-DestroyMenu /Music/LoadPlaylist
-AddToMenu /Music/LoadPlaylist
-+ '$[gt.Choose playlist to load]' Nop
-+ MissingSubmenuFunction FuncFvwmMenuAudioDirectory
-+ '%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
+ I Exec exec alsaplayer --clear
-DestroyFunc Playlist-generator-button
AddToFunc Playlist-generator-button
+ I DestroyMenu recreate /Playlist-button
-+ I AddToMenu /Playlist-button '$[gt.Playlists operations]' Nop
+ I AddToMenu /Playlist-button '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
+ I AddToMenu /Playlist-button '$[gt.Playlist copy]' Popup /Music/CopyPlaylist
+ I AddToMenu /Playlist-button '$[gt.Clear playlist]' Music-ClearPlaylist
+ I AddToMenu /Playlist-button '$[gt.Load playlist]' Popup /Music/LoadPlaylist
-DestroyMenu /Playlist-button
AddToMenu /Playlist-button
+ DynamicPopupAction Function Playlist-generator-button
# mouse 2 Menu /Playback {{{2
-DestroyFunc Music-Next
AddToFunc Music-Next
+ I Exec exec alsaplayer --next
-DestroyFunc Music-Prev
AddToFunc Music-Prev
+ I Exec exec alsaplayer --prev
-DestroyFunc Music-SongChange
AddToFunc Music-SongChange
+ I Exec exec alsaplayer --jump $0
-DestroyMenu /Music/SongChange
AddToMenu /Music/SongChange
+ " 1" Music-SongChange '1'
+ " 2" Music-SongChange '2'
@@ -120,27 +105,21 @@
+ "19" Music-SongChange '19'
+ "20" Music-SongChange '20'
-DestroyFunc Music-Stop
AddToFunc Music-Stop
+ I Exec exec alsaplayer --stop
-DestroyFunc Music-Play
AddToFunc Music-Play
+ I Exec exec alsaplayer --start
-DestroyFunc Music-Pause
AddToFunc Music-Pause
+ I Exec exec alsaplayer --speed 0
-DestroyFunc Music-PlayPause
AddToFunc Music-PlayPause
+ I Exec exec alsaplayer --speed $[infostore.speed] > /dev/null
-DestroyFunc Music-Jump
AddToFunc Music-Jump
+ I Exec exec alsaplayer --seek $0
-DestroyMenu /Music/Jump
AddToMenu /Music/Jump
+ " 15 min" Music-Jump '900'
+ " 10 min" Music-Jump '600'
@@ -152,11 +131,9 @@
+ " 30 sec" Music-Jump '30'
+ " 10 sec" Music-Jump '10'
-DestroyFunc Music-Seek
AddToFunc Music-Seek
+ I Exec exec alsaplayer --relative $0
-DestroyMenu /Music/Seek
AddToMenu /Music/Seek
+ " 10 min" Music-Seek '600'
+ " 5 min" Music-Seek '300'
@@ -176,7 +153,6 @@
+ " -5 min" Music-Seek '-300'
+ "-10 min" Music-Seek '-600'
-DestroyFunc Playback-generator
AddToFunc Playback-generator
+ I DestroyMenu recreate /Playback
+ I AddToMenu /Playback '$[gt.Next]' Music-Next
@@ -200,11 +176,9 @@
# mouse 2 Music-PlayPause : allready here
# mouse 3 Menu /Music/Volume
-DestroyFunc Music-VolumeFr
AddToFunc Music-VolumeFr
+ I Exec exec alsaplayer --volume $0
-DestroyFunc Music-VolumeEn
AddToFunc Music-VolumeEn
+ I Exec exec alsaplayer --volume $0
@@ -235,18 +209,15 @@
# mouse 4 Music-Speed-Up {{{2
# mouse 5 Music-Speed-Down
-DestroyFunc Music-Speed-Up
AddToFunc Music-Speed-Up
+ I PipeRead 'alsaplayer --speed $($[FVWM_SYSTEMDIR]/scripts/speed_value +1comma alsaplayer $[infostore.speed]) > /dev/null; echo InfoStoreAdd speed `$[FVWM_SYSTEMDIR]/scripts/speed_value +1comma alsaplayer $[infostore.speed]`'
-DestroyFunc Music-Speed-Down
AddToFunc Music-Speed-Down
+ I PipeRead 'alsaplayer --speed $($[FVWM_SYSTEMDIR]/scripts/speed_value -1comma alsaplayer $[infostore.speed]) > /dev/null ; echo InfoStoreAdd speed `$[FVWM_SYSTEMDIR]/scripts/speed_value -1comma alsaplayer $[infostore.speed]`'
# Last button {{{1
# speed controls
# mouse 1 Menu /Speed {{{2
-DestroyFunc Music-Speed
AddToFunc Music-Speed
+ I PipeRead 'alsaplayer --speed $($[FVWM_SYSTEMDIR]/scripts/speed_value $0 alsaplayer $[infostore.speed]) > /dev/null; echo InfoStoreAdd speed `$[FVWM_SYSTEMDIR]/scripts/speed_value $0 alsaplayer $[infostore.speed]`'
@@ -282,18 +253,15 @@
## mouse 4 Button-Seek-+ {{{2
## mouse 5 Button-Seek--
-DestroyFunc Button-Seek-+
AddToFunc Button-Seek-+
+ I Music-Seek '15'
-DestroyFunc Button-Seek--
AddToFunc Button-Seek--
+ I Music-Seek '-15'
# Music menus {{{1
# Recipe without audio buttons use the following:
# Popup /Music {{{2
-DestroyFunc Music-generator
AddToFunc Music-generator
+ I DestroyMenu recreate /Music
+ I AddToMenu /Music '$[gt.Player]' Popup /Player
Modified: fvwm/components/functions/Music-audacious
===================================================================
--- fvwm/components/functions/Music-audacious 2013-04-13 19:44:57 UTC (rev 234)
+++ fvwm/components/functions/Music-audacious 2013-04-14 17:07:14 UTC (rev 235)
@@ -2,6 +2,7 @@
# Written by: Rafael Antonio Porras Samaniego <sp...@di...>
# Modifications, debugging and improvments by Dominique Michel 2008-2013
# <dom...@us...>
+# See ChangeLog for details
# Initialisations, shared functions
Include components/functions/Music
@@ -9,19 +10,9 @@
# First button {{{1
# Player controls and prefs
# mouse 1 Menu /Player
-#DestroyFunc Music-Start
-#AddToFunc Music-Start
-#+ I Exec exec $0
-
-#DestroyMenu /Music/Start
-#AddToMenu /Music/Start
-#+ '$[gt.Start Audacious]' Music-Start "audacious"
-
-DestroyFunc Music-GUI
AddToFunc Music-GUI
+ I All (audacious) 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
@@ -42,12 +33,9 @@
# 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`
-All (Music-SavePlaylist-Dialog) Close
-DestroyModuleConfig Music-SavePlaylist-Dialog: *
*Music-SavePlaylist-Dialog: Title "$[gt.Save playlist]"
*Music-SavePlaylist-Dialog: Text "$[gt.Name of the playlist]"
*Music-SavePlaylist-Dialog: Line center
@@ -64,11 +52,10 @@
done'
*Music-SavePlaylist-Dialog: Line center
-DestroyFunc Music-SavePlaylist
AddToFunc Music-SavePlaylist
+ I Module FvwmForm Music-SavePlaylist-Dialog
-DestroyFunc FuncFvwmMenuAudioDirectory
+# /Music/LoadPlaylist
AddToFunc FuncFvwmMenuAudioDirectory
+ I PipeRead 'case "$0" in \
"$[infostore.AudioPlaylists]"*) myexec="audacious";; \
@@ -82,17 +69,9 @@
--exec-file "^${myexec}" --dir "$0" \
--exec-t="-"'
-DestroyMenu /Music/LoadPlaylist
-AddToMenu /Music/LoadPlaylist
-+ MissingSubmenuFunction FuncFvwmMenuAudioDirectory
-+ '%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
+ I Exec exec audtool playlist-clear
-DestroyFunc Playlist-generator-button
AddToFunc Playlist-generator-button
+ I DestroyMenu recreate /Playlist-button
+ I AddToMenu /Playlist-button '$[gt.Remove current song]' Music-RemoveSong
@@ -103,41 +82,32 @@
+ I AddToMenu /Playlist-button '$[gt.Load playlist]' Popup /Music/LoadPlaylist
+ I AddToMenu /Playlist-button '$[gt.Clear playlist]' Music-ClearPlaylist
-DestroyMenu /Playlist-button
AddToMenu /Playlist-button
+ DynamicPopupAction Function Playlist-generator-button
## mouse 2 Menu /Playback
#########################
-DestroyFunc Music-Next
AddToFunc Music-Next
+ I Exec exec audtool playlist-advance
-DestroyFunc Music-Prev
AddToFunc Music-Prev
+ I Exec exec audtool playlist-reverse
-DestroyFunc Music-Stop
AddToFunc Music-Stop
+ I Exec exec audtool playback-stop
-DestroyFunc Music-Play
AddToFunc Music-Play
+ I Exec exec audtool playback-play
-DestroyFunc Music-Pause
AddToFunc Music-Pause
+ I Exec exec audtool playback-pause
-DestroyFunc Music-PlayPause
AddToFunc Music-PlayPause
+ I Exec exec audacious -t
-DestroyFunc Music-ToggleRandom
AddToFunc Music-ToggleRandom
+ I Exec exec audtool playlist-shuffle-toggle
-DestroyFunc Playback-generator
AddToFunc Playback-generator
+ I DestroyMenu recreate /Playback
+ I AddToMenu /Playback '$[gt.Next]' Music-Next
@@ -159,11 +129,9 @@
# 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
-DestroyMenu /Music/Volume
AddToMenu /Music/Volume
+ '$[gt.Player volume]'
+ "" Nop
@@ -179,7 +147,6 @@
# Music menus {{{1
# Recipe without audio buttons use the following:
# Popup /Music
-DestroyFunc Music-generator
AddToFunc Music-generator
+ I DestroyMenu recreate /Music
+ I AddToMenu /Music '$[gt.Load playlist]' Popup /Music/LoadPlaylist
@@ -189,7 +156,7 @@
+ I AddToMenu /Music '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
+ I AddToMenu /Music '$[gt.Playlist copy]' Popup /Music/CopyPlaylist
+ I AddToMenu /Music "" Nop
-+ I PipeRead 'audtool get-volume | sed -e "s:[ \t]::g" | sed -e "s:^.\\+$:AddToMenu\ /Music \'$[gt.Volume] \(&%%\)\' Popup /Mixer:"'
++ I PipeRead 'audtool get-volume | sed -e "s:[ \t]::g" | sed -e "s:^.\\+$:AddToMenu\ /Music \'$[gt.Volume] \(&%%\)\' Popup /Music/Volume:"'
+ I AddToMenu /Music '$[gt.Toggle random]' Music-ToggleRandom
+ I AddToMenu /Music '$[gt.Toggle repeat]' Exec exec audtool playlist-repeat-toggle
+ I AddToMenu /Music "" Nop
@@ -202,8 +169,19 @@
+ I AddToMenu /Music '$[gt.Recreate the Playlists]' Music-RecreatePlaylist
+ I AddToMenu /Music '$[gt.Music player]' Popup /Preferences/MusicPlayer
-DestroyMenu /Music
-AddToMenu /Music
-+ DynamicPopupAction Function Music-generator
+# Fake button functions (see Music-cdcd) {{{1
+# Music-Speed-Up
+AddToFunc Music-Speed-Up
++ I Nop
+# Music-Speed-Down
+AddToFunc Music-Speed-Down
++ I Nop
+# Menu /Speed
+AddToMenu /Speed
++ "" Nop
+# Music-Seek-+
+# Music-Seek--
+AddToFunc Music-Seek
++ I Nop
# vim:ft=fvwm
Modified: fvwm/components/functions/Music-cdcd
===================================================================
--- fvwm/components/functions/Music-cdcd 2013-04-13 19:44:57 UTC (rev 234)
+++ fvwm/components/functions/Music-cdcd 2013-04-14 17:07:14 UTC (rev 235)
@@ -2,7 +2,8 @@
# Written by: Maciej Delmanowski <ha...@po...>
# sed commands by: Grzegorz Niew\xEAg\xB3owski <ho...@do...>
# Modifications, debugging and improvments by Dominique Michel
-# <dom...@so...>
+# <dom...@us...> 2008-2013
+# See ChangeLog for details
# Overview:
# This is a set of function for controlling the CDCD CD Audio player
@@ -11,23 +12,17 @@
# Initialisations, shared functions
Include components/functions/Music
-###################
-## First button ###
-## Player controls and prefs ##
-###############################
-## mouse 1 Menu /Player
-#######################
-DestroyFunc Music-cdcd
+# First button {{{1
+# Player controls and prefs
+# mouse 1 Menu /Player {{{2
AddToFunc Music-cdcd
+ I Exec exec cdcd $0 > /dev/null
-DestroyFunc Music-GUI
AddToFunc Music-GUI
+ I All (cdcd) Close
+ I TestRc (NoMatch) None (cdcd) AT cdcd cdcd
# Player-generator (All)
-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
@@ -39,54 +34,40 @@
+ I AddToMenu /Player '$[gt.Stop player]' Music-cdcd quit
+ 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
-####################
-## Second button ###
-## Player controls and main vol ##
-##################################
-## mouse 1 Menu /Playlist-button
-################################
-## mouse 2 Menu /Playback
-#########################
-DestroyFunc Music-Next
+# Second button {{{1
+# Player controls and main vol
+# mouse 1 Menu /Playlist-button {{{2
+# mouse 2 Menu /Playback
AddToFunc Music-Next
+ I Music-cdcd next
-DestroyFunc Music-Prev
AddToFunc Music-Prev
+ I Music-cdcd prev
-DestroyFunc Music-Stop
AddToFunc Music-Stop
+ I Music-cdcd stop
-DestroyFunc Music-Play
AddToFunc Music-Play
+ I Music-cdcd play
-DestroyFunc Music-Pause
AddToFunc Music-Pause
+ I Music-cdcd toggle
-DestroyFunc Music-PlayPause
AddToFunc Music-PlayPause
+ I Music-cdcd toggle
-DestroyFunc Music-Forward
AddToFunc Music-Forward
+ I Music-cdcd ff
-DestroyFunc Music-Backward
AddToFunc Music-Backward
+ I Muisc-cdcd rew
-DestroyFunc Playback-generator
AddToFunc Playback-generator
+ I DestroyMenu recreate /Playback
+ I AddToMenu /Playback '$[gt.Next]' Music-Next
@@ -99,19 +80,46 @@
+ I AddToMenu /Playback '$[gt.Forward]' Music-Forward
+ I AddToMenu /Playback '$[gt.Backward]' Music-Backward
-## mouse 3 Menu /Mixer : in components/Mixer
-## mouse 4 Music-Next : allready here
-## mouse 4 Music-Prev : allready here
+# Main menu {{{1
+AddToFunc Music-generator
++ I DestroyMenu recreate /Music
++ I AddToMenu /Music '$[gt.Volume]' Popup /Mixer
++ I AddToMenu /Music "" Nop
++ I AddToMenu /Music '$[gt.Stop playback]' Music-Stop
++ I AddToMenu /Music '$[gt.Show/Hide player]' Music-GUI
++ I AddToMenu /Music '$[gt.Play/Pause]' Music-PlayPause
++ I AddToMenu /Music "" Nop
++ I AddToMenu /Music '$[gt.Music player]' Popup /Preferences/MusicPlayer
-
-# ---------------------------------------------------------------------------
-# Main menu
-DestroyMenu /Music
-AddToMenu /Music
-+ '$[gt.Volume]' Popup /Mixer
+# Fake button functions {{{1
+# Menu /Player Music-GUI
+# Music-QJackGUI (in Music)
+# Mixer-Volume-Up (in Mixer)
+# Mixer-Volume-Down (in Mixer)
+# /Playlist-button
+AddToMenu /Playlist-button
+ "" Nop
-+ '$[gt.Stop playback]' Music-Stop
-+ '$[gt.Show/Hide player]' Music-GUI
-+ '$[gt.Play/Pause]' Music-PlayPause
+# Menu /Music/Volume (TODO)
+AddToMenu /Music/Volume
++ "" Nop
+# Menu /Mixer (in Mixer)
+# Music-Next
+# Music-Prev
+# Music-Play
+# Music-Pause
+# Menu /Playback
+# Music-Speed-Up
+AddToFunc Music-Speed-Up
++ I Nop
+# Music-Speed-Down
+AddToFunc Music-Speed-Down
++ I Nop
+# Menu /Speed
+AddToMenu /Speed
++ "" Nop
+# Music-Seek-+
+# Music-Seek--
+AddToFunc Music-Seek
++ I Nop
# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
