Menu
▾
▴
fvwm-crystal-commits
|
From: <dom...@us...> - 2013-04-04 22:38:54
|
Revision: 158
http://sourceforge.net/p/fvwm-crystal/code/158
Author: dominique_libre
Date: 2013-04-04 22:38:51 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
Very strange, we need to pass 9 paramters to a function that use only 8
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/NotificationAreaManager
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-04 22:16:16 UTC (rev 157)
+++ ChangeLog 2013-04-04 22:38:51 UTC (rev 158)
@@ -12,6 +12,9 @@
area using function parameters instead of the environment.
Updated the Default recipe to use it.
Updated the Amiga recipe to use it.
+ functions/NotificationAreaManager: Very strange, we need to pass 9
+ paramters to the trayer function when only 8 are used in this
+ function...
Mercredi 3 Avril 2013 Dominique Michel
fvwm-crystal.generate-menu: run convert on the generated icon to
Modified: fvwm/components/functions/NotificationAreaManager
===================================================================
--- fvwm/components/functions/NotificationAreaManager 2013-04-04 22:16:16 UTC (rev 157)
+++ fvwm/components/functions/NotificationAreaManager 2013-04-04 22:38:51 UTC (rev 158)
@@ -62,9 +62,10 @@
+ I Style trayer NoTitle, !Borders, NoIcon
# Call the wanted manager {{{1
+# Very strange, we need 9 parameters for trayer when we only use 8
DestroyFunc NotificationArea
AddToFunc NotificationArea
-+ I Test (EnvMatch NotificationAreaManager trayer) TrayerPanel $0 $1 $2 $3 $4 $5 $6 $7
++ I Test (EnvMatch NotificationAreaManager trayer) TrayerPanel $0 $1 $2 $3 $4 $5 $6 $7 $9
+ I Test (EnvMatch NotificationAreaManager stalonetray) FvwmStalonePanel $*
# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-04 22:48:49
|
Revision: 159
http://sourceforge.net/p/fvwm-crystal/code/159
Author: dominique_libre
Date: 2013-04-04 22:48:46 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
That's because the quoting must survive: typo
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/NotificationAreaManager
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-04 22:38:51 UTC (rev 158)
+++ ChangeLog 2013-04-04 22:48:46 UTC (rev 159)
@@ -12,9 +12,9 @@
area using function parameters instead of the environment.
Updated the Default recipe to use it.
Updated the Amiga recipe to use it.
- functions/NotificationAreaManager: Very strange, we need to pass 9
- paramters to the trayer function when only 8 are used in this
- function...
+ functions/NotificationAreaManager: We need to pass 9 paramters to
+ the trayer function when only 8 are used in it, that's because the
+ quoting must survive to that file.
Mercredi 3 Avril 2013 Dominique Michel
fvwm-crystal.generate-menu: run convert on the generated icon to
Modified: fvwm/components/functions/NotificationAreaManager
===================================================================
--- fvwm/components/functions/NotificationAreaManager 2013-04-04 22:38:51 UTC (rev 158)
+++ fvwm/components/functions/NotificationAreaManager 2013-04-04 22:48:46 UTC (rev 159)
@@ -63,9 +63,10 @@
# Call the wanted manager {{{1
# Very strange, we need 9 parameters for trayer when we only use 8
+# It's because the quoting are transmited here and are needed.
DestroyFunc NotificationArea
AddToFunc NotificationArea
-+ I Test (EnvMatch NotificationAreaManager trayer) TrayerPanel $0 $1 $2 $3 $4 $5 $6 $7 $9
++ I Test (EnvMatch NotificationAreaManager trayer) TrayerPanel $0 $1 $2 $3 $4 $5 $6 $7 $8
+ I Test (EnvMatch NotificationAreaManager stalonetray) FvwmStalonePanel $*
# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-08 17:00:23
|
Revision: 196
http://sourceforge.net/p/fvwm-crystal/code/196
Author: dominique_libre
Date: 2013-04-08 17:00:20 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
silent the external applications that send junk (from Fvwm point of vue) at stderr
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Exec-Accelerator
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-08 16:38:07 UTC (rev 195)
+++ ChangeLog 2013-04-08 17:00:20 UTC (rev 196)
@@ -13,6 +13,8 @@
to reflect that change.
Mass removingg of the fonts encoding; Crystal use Xft and it is
better to use the user default config.
+ functions/Exec-Accelerator: silent the external applications that send
+ junk (from Fvwm point of vue) at stderr
Dimanche 7 Avril 2013 Dominique Michel
Modified: fvwm/components/functions/Exec-Accelerator
===================================================================
--- fvwm/components/functions/Exec-Accelerator 2013-04-08 16:38:07 UTC (rev 195)
+++ fvwm/components/functions/Exec-Accelerator 2013-04-08 17:00:20 UTC (rev 196)
@@ -22,6 +22,10 @@
# AT
# As 'A' function, but give a Title to the window terminal.
+# C
+# Launches a the fvwm console terminal with optional program as an argument.
+# Terminal settings should be set using ~/.Xresources file or (in Eterm) theme file.
+
# X
# Launches a command in the background. Typically this function is used to
# launch some X application without additional terminal window.
@@ -38,6 +42,11 @@
# it uses graphical client called 'gksudo' to execute a command. Unfortunately
# this variant is only usable with graphical applications.
+# To get all the junk from KDE and GTK applications
+#InfoStoreAdd SILENT ""
+# To not get that junk
+InfoStoreAdd SILENT "2>/dev/null"
+
SetEnv DefaultTerminal NO_DEFAULT_TERMINAL_FOUND
#FindCommand DefaultTerminal urxvt aterm xterm
CheckPreferences DefaultTerminal "SavePreferences DefaultTerminal 'FindCommand DefaultTerminal urxvt aterm xterm'"
@@ -47,35 +56,41 @@
DestroyFunc A
AddToFunc A
+ I Window-SetPlacementPolicy
-+ I Exec exec $[DefaultTerminal] -e $*
++ I Exec exec $[DefaultTerminal] -e $* $[infostore.SILENT]
DestroyFunc AA
AddToFunc AA
+ I Window-SetPlacementPolicy
-+ I Exec exec $[DefaultTerminal]
++ I Exec exec $[DefaultTerminal] $[infostore.SILENT]
# Usage: AT [title] [command] (Use quotes if you want command options or title with spaces)
DestroyFunc AT
AddToFunc AT
+ I Window-SetPlacementPolicy
+ I Test (!EnvMatch DefaultTerminal gnome-terminal, !EnvMatch DefaultTerminal multi-gnome-terminal, !EnvMatch DefaultTerminal terminator) Exec exec $[DefaultTerminal] -title $0 -e $1
-+ I TestRc (NoMatch) Exec exec $[DefaultTerminal] --title "$0" -e "$1"
++ I TestRc (NoMatch) Exec exec $[DefaultTerminal] --title "$0" -e "$1" $[infostore.SILENT]
+# Usage: C [command] [command options]
+DestroyFunc C
+AddToFunc C
++ I Window-SetPlacementPolicy
++ I Exec exec $[FvwmConsoleTerminal] -e $* $[infostore.SILENT]
+
# Usage: X [command] [command options]
DestroyFunc X
AddToFunc X
+ I Window-SetPlacementPolicy
-+ I Exec exec $*
++ I Exec exec $* $[infostore.SILENT]
# Usage: S [command] [command options]
DestroyFunc S
AddToFunc S
-+ I A sudo $*
++ I C sudo $* $[infostore.SILENT]
# Usage: SX [command]
DestroyFunc SX
AddToFunc SX
-+ I X gksudo $*
++ I X gksudo $* $[infostore.SILENT]
# Dummy function created to avoid the error messages.
# If the real function is used, this does nothing.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-08 17:06:10
|
Revision: 197
http://sourceforge.net/p/fvwm-crystal/code/197
Author: dominique_libre
Date: 2013-04-08 17:06:07 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
Silent trayer and stalonetray as well
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/NotificationAreaManager-stalonetray
fvwm/components/functions/NotificationAreaManager-trayer
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-08 17:00:20 UTC (rev 196)
+++ ChangeLog 2013-04-08 17:06:07 UTC (rev 197)
@@ -15,6 +15,7 @@
better to use the user default config.
functions/Exec-Accelerator: silent the external applications that send
junk (from Fvwm point of vue) at stderr
+ functions/NotificationAreaManager-*: silent trayer and stalonetray as well
Dimanche 7 Avril 2013 Dominique Michel
Modified: fvwm/components/functions/NotificationAreaManager-stalonetray
===================================================================
--- fvwm/components/functions/NotificationAreaManager-stalonetray 2013-04-08 17:00:20 UTC (rev 196)
+++ fvwm/components/functions/NotificationAreaManager-stalonetray 2013-04-08 17:06:07 UTC (rev 197)
@@ -29,7 +29,7 @@
--kludges force_icons_size \
--icon-size $[0] \
--geometry $[1]x$[2]$[3]$[4] \
---icon-gravity $[5] 2>/dev/null')
+--icon-gravity $[5] $[infostore.SILENT]')
+ I Module FvwmButtons -g $[6]x$[7]$[8]$[9] FvwmStalonePanel
+ I Style FvwmStalonePanel ParentalRelativity
+ I Style stalonetray NoTitle, !Borders, NoIcon
Modified: fvwm/components/functions/NotificationAreaManager-trayer
===================================================================
--- fvwm/components/functions/NotificationAreaManager-trayer 2013-04-08 17:00:20 UTC (rev 196)
+++ fvwm/components/functions/NotificationAreaManager-trayer 2013-04-08 17:06:07 UTC (rev 197)
@@ -26,7 +26,7 @@
--tint $[TrayerTint] \
--margin $[5] \
--distance $[6] \
-$[7]
+$[7] $[infostore.SILENT]
+ I Style trayer NoTitle, NoIcon
# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-08 18:47:29
|
Revision: 198
http://sourceforge.net/p/fvwm-crystal/code/198
Author: dominique_libre
Date: 2013-04-08 18:47:23 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
functions/Exec-Accelerator: add missing quotes in AT function
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Exec-Accelerator
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-08 17:06:07 UTC (rev 197)
+++ ChangeLog 2013-04-08 18:47:23 UTC (rev 198)
@@ -14,7 +14,7 @@
Mass removingg of the fonts encoding; Crystal use Xft and it is
better to use the user default config.
functions/Exec-Accelerator: silent the external applications that send
- junk (from Fvwm point of vue) at stderr
+ junk (from Fvwm point of vue) at stderr; add missinmg quotes in AT function.
functions/NotificationAreaManager-*: silent trayer and stalonetray as well
Dimanche 7 Avril 2013 Dominique Michel
Modified: fvwm/components/functions/Exec-Accelerator
===================================================================
--- fvwm/components/functions/Exec-Accelerator 2013-04-08 17:06:07 UTC (rev 197)
+++ fvwm/components/functions/Exec-Accelerator 2013-04-08 18:47:23 UTC (rev 198)
@@ -67,7 +67,7 @@
DestroyFunc AT
AddToFunc AT
+ I Window-SetPlacementPolicy
-+ I Test (!EnvMatch DefaultTerminal gnome-terminal, !EnvMatch DefaultTerminal multi-gnome-terminal, !EnvMatch DefaultTerminal terminator) Exec exec $[DefaultTerminal] -title $0 -e $1
++ I Test (!EnvMatch DefaultTerminal gnome-terminal, !EnvMatch DefaultTerminal multi-gnome-terminal, !EnvMatch DefaultTerminal terminator) Exec exec $[DefaultTerminal] -title "$0" -e $1
+ I TestRc (NoMatch) Exec exec $[DefaultTerminal] --title "$0" -e "$1" $[infostore.SILENT]
# Usage: C [command] [command options]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-10 16:35:19
|
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.
|
|
From: <dom...@us...> - 2013-04-11 09:04:06
|
Revision: 216
http://sourceforge.net/p/fvwm-crystal/code/216
Author: dominique_libre
Date: 2013-04-11 09:04:02 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
Music-mplayer: fix glitch into the speed control. Music-mplayer2: introduced all the changes from Music-mplayer.
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Music-mplayer
fvwm/components/functions/Music-mplayer2
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-11 06:27:29 UTC (rev 215)
+++ ChangeLog 2013-04-11 09:04:02 UTC (rev 216)
@@ -2,7 +2,10 @@
Jeudi 11 Avril 2013 Dominique Michel
FAQ: Added q.a. about tear off menus.
-
+ functions/Music-mplayer: fix glitch into the speed control
+ funvtions/Music-mplayer2: Introduced all the change from
+ Music-mplayer
+
Mercredi 10 Avril 2013 Dominique Michel
+ scripts/media_directories: auto generation of the /Music/LoadMovies
Modified: fvwm/components/functions/Music-mplayer
===================================================================
--- fvwm/components/functions/Music-mplayer 2013-04-11 06:27:29 UTC (rev 215)
+++ fvwm/components/functions/Music-mplayer 2013-04-11 09:04:02 UTC (rev 216)
@@ -220,19 +220,19 @@
# mouse 4 Music-Speed-Up {{{2
DestroyFunc Music-Speed-Up
AddToFunc Music-Speed-Up
-+ I PipeRead 'echo InfoStoreAdd speed `$[FVWM_SYSTEMDIR]/scripts/speed_value +1comma mplayer $[infostore.speed]`; echo "speed_set `$[FVWM_SYSTEMDIR]/scripts/speed_value +1comma mplayer $[infostore.speed]`" > /home/$[infostore.USERDIR]/.mplayer/pipe'
++ 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 InfoStoreAdd speed `$[FVWM_SYSTEMDIR]/scripts/speed_value -1comma mplayer $[infostore.speed]`; echo "speed_set `$[FVWM_SYSTEMDIR]/scripts/speed_value -1comma mplayer $[infostore.speed]`" > /home/$[infostore.USERDIR]/.mplayer/pipe'
++ 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 InfoStoreAdd "speed `$[FVWM_SYSTEMDIR]/scripts/speed_value "$[0]" mplayer $[infostore.speed]`"; echo "speed_set `$[FVWM_SYSTEMDIR]/scripts/speed_value "$0" mplayer $[infostore.speed]`" > /home/$[infostore.USERDIR]/.mplayer/pipe'
++ 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
Modified: fvwm/components/functions/Music-mplayer2
===================================================================
--- fvwm/components/functions/Music-mplayer2 2013-04-11 06:27:29 UTC (rev 215)
+++ fvwm/components/functions/Music-mplayer2 2013-04-11 09:04:02 UTC (rev 216)
@@ -1,54 +1,34 @@
-# Support for MPlayer media player into Fvwm-Crystal
-# Written by: Dominique Michel <dom...@so...>
+# Support for MPlayer2 media player into Fvwm-Crystal
+# Written by: Dominique Michel <dominique_libreourceforge.net> 2009-2013
-# TODO : support for recording
-
-# Initialisations, shared functions
+# Initialisations, shared functions {{{1
Include components/functions/Music
-#############
-# Variables #
-#############
-# We must start mplayer in slave mode and send the commands via a pipe
+# 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 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"
-
-###################
-## First button ###
-## Player controls and prefs ##
-###############################
-## mouse 1 Menu /Player
-#######################
+# 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, -menu -fs -fixed-vo -slave -idle -input file=/home/$[USERDIR]/.mplayer/pipe"
++ '$[gt.Start MPlayer2]' Music-Start "mplayer2 -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
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
@@ -63,58 +43,30 @@
+ I AddToMenu /Player '$[gt.Stop MPlayer2]' Music-Kill
+ I AddToMenu /Player '$[gt.Show/Hide menu]' 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
-################################
+# 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 $[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 $[infostore.USERDIR]'
+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 +79,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.Personal audio playlists]' Popup $[infostore.UserManagedAudioPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Video playlists]' Popup $[infostore.VideoPlaylists]
++ '%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}; \
@@ -158,28 +110,26 @@
AddToMenu /Playlist-button
+ DynamicPopupAction Function Playlist-generator-button
-## mouse 2 Menu /Playback
-#########################
+# mouse 2 Menu /Playback {{{1
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 +146,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
@@ -232,25 +182,22 @@
+ I AddToMenu /Playback '$[gt.Jump]' Popup /Music/Jump
+ I AddToMenu /Playback '$[gt.Seek]' Popup /Music/Seek
-## 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
-DestroyFunc Music-PlayPause
-AddToFunc Music-PlayPause
-+ I Exec exec echo "frame_step" > /home/$[USERDIR]/.mplayer/pipe
+# 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 3 Menu /Music/Volume
-#############################
+# 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/$[USERDIR]/.mplayer/pipe
++ I Exec exec echo "volume $0 1" > /home/$[infostore.USERDIR]/.mplayer/pipe
DestroyMenu /Music/Volume
AddToMenu /Music/Volume
@@ -265,30 +212,22 @@
+ "- 36 db" Music-Volume "1.5625"
+ " 0" Music-Volume "0"
-## mouse 4 Music-Speed-Up
-#########################
+# mouse 4 Music-Speed-Up {{{2
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 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
-###########################
+# mouse 5 Music-Speed-Down {{{2
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 PipeRead 'echo InfoStoreAdd speed $($[FVWM_SYSTEMDIR]/scripts/speed_value -1comma mplayer $[infostore.speed]) ; 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 ###
-## speed controls ##
-####################
-## mouse 1 Menu /Speed
-######################
+# Last button {{{1
+# speed controls
+# mouse 1 Menu /Speed {{{2
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 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
@@ -322,33 +261,21 @@
+ '$[gt.Pause]' Music-Pause
+ '$[gt.- 1 comma]' Music-Speed '-1comma mplayer'
-## mouse 4 Button-Seek-+
-## mouse 5 Button-Seek--
+# mouse 4 Button-Seek-+ {{{2
+# mouse 5 Button-Seek--
-# ---------------------------------------------------------------------------
-# Basic control functions
+# Basic control functions {{{1
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
+# Playlist functions and menus {{{1
-# 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.Stop MPlayer]' Music-Kill
-# + '$[gt.Show/Hide player]' Music-GUI
-
-# ---------------------------------------------------------------------------
-# Playlist functions and menus
-
DestroyMenu /Playlist
AddToMenu /Playlist
+ DynamicPopupAction Function /Playlist-generator
@@ -357,8 +284,7 @@
AddToMenu /Playlist-bot
+ DynamicPopupAction Function /Playlist-generator-bot
-#-----------------------------------------------------------------------------------
-# Main functions and menus
+# Main functions and menus {{{1
DestroyFunc /Playlist-generator
AddToFunc /Playlist-generator
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-11 17:40:49
|
Revision: 220
http://sourceforge.net/p/fvwm-crystal/code/220
Author: dominique_libre
Date: 2013-04-11 17:40:44 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
Opps
Modified Paths:
--------------
fvwm/components/functions/Music-mplayer
fvwm/components/functions/Music-mplayer2
Modified: fvwm/components/functions/Music-mplayer
===================================================================
--- fvwm/components/functions/Music-mplayer 2013-04-11 16:36:28 UTC (rev 219)
+++ fvwm/components/functions/Music-mplayer 2013-04-11 17:40:44 UTC (rev 220)
@@ -233,7 +233,7 @@
# 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])"'
++ 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
Modified: fvwm/components/functions/Music-mplayer2
===================================================================
--- fvwm/components/functions/Music-mplayer2 2013-04-11 16:36:28 UTC (rev 219)
+++ fvwm/components/functions/Music-mplayer2 2013-04-11 17:40:44 UTC (rev 220)
@@ -221,7 +221,7 @@
# mouse 5 Music-Speed-Down {{{2
DestroyFunc Music-Speed-Down
AddToFunc Music-Speed-Down
-+ I PipeRead 'echo InfoStoreAdd speed $($[FVWM_SYSTEMDIR]/scripts/speed_value -1comma mplayer $[infostore.speed]) ; 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])'
++ 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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-11 21:28:41
|
Revision: 221
http://sourceforge.net/p/fvwm-crystal/code/221
Author: dominique_libre
Date: 2013-04-11 21:28:38 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
moved Music-alsaplayer to infostore
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Music
fvwm/components/functions/Music-alsaplayer
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-11 17:40:44 UTC (rev 220)
+++ ChangeLog 2013-04-11 21:28:38 UTC (rev 221)
@@ -8,6 +8,8 @@
Music-mplayer
Addedl capture option to mplayer(2). To press "c" will cause mplayer
to start/stop to dump the stream.
+ function/Music-alsaplayer: moved the envirnoment variables to
+ infostore; cleanup
Mercredi 10 Avril 2013 Dominique Michel
Modified: fvwm/components/functions/Music
===================================================================
--- fvwm/components/functions/Music 2013-04-11 17:40:44 UTC (rev 220)
+++ fvwm/components/functions/Music 2013-04-11 21:28:38 UTC (rev 221)
@@ -78,19 +78,13 @@
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
InfoStoreAdd speed 1
-Test (EnvMatch MusicPlayer alsaplayer) SetEnv speed "1"
-Test (EnvMatch MusicPlayer mplayer2) SetEnv speed "1"
+
# 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 {{{2
-# mplayer(2)
-UnSetEnv fvwm_video_exec
+PipeRead 'if [[ $[MusicPlayer] == alsaplayer ]]; then echo "InfoStoreAdd dec_point `locale decimal_point`"; fi'
# xmms2
UnSetEnv fvwm_audio_exec
Modified: fvwm/components/functions/Music-alsaplayer
===================================================================
--- fvwm/components/functions/Music-alsaplayer 2013-04-11 17:40:44 UTC (rev 220)
+++ fvwm/components/functions/Music-alsaplayer 2013-04-11 21:28:38 UTC (rev 221)
@@ -1,49 +1,13 @@
# Support for Alsaplayer in Fvwm-Crystal
-# Written by: Dominique Michel <dom...@so...>
+# Written by: Dominique Michel <dom...@us...> 2008-2013
-###############################
-# Media control writing style #
-###############################
-# 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 into the recipes are:
-# Button 1: (Mouse 1) Menu /Player # Main player menu
-# (Mouse 2) Music-GUI # show/hide the player
-# (Mouse 3) Music-QJackGUI # show/hide QJackCtl
-# (Mouse 4) Mixer-Volume-Up # main volume up
-# (Mouse 5) Mixer-Volume-Down # main volume down
-# Button 2: (Mouse 1) Menu /Playlist-button # playlist menu
-# (Mouse 2) Menu /Playback # playback menu
-# (Mouse 3) Menu /Mixer # main mixer menu
-# (Mouse 4) Music-Next # next media
-# (Mouse 5) Music-Prev # previous media
-# Button 3: (Mouse 1) Music-Pause # pause
-# (Mouse 2) Music-PlayPause # play/pause
-# (Mouse 3) Menu /Music/Volume # player volume menu
-# (Mouse 4) Music-Speed-Up # speed up
-# (Mouse 5) Music-Speed-Down # speed down
-# Button 4: (Mouse 1) Menu /Speed # speed control menu
-# (Mouse 4) Button-Seek-+ # seek forward
-# (Mouse 5) Button-Seek-- # seek backward
-#
-# Recipes with media menu: Clean, Clean Vertical, Light, Wing-Commander
-# The media menu for those recipes is: Popup /Music
-# Popup /Music can reuse the finctions/menu defined for the bouton or use their own.
-####################################################################################
-
-#######################################
-## Initialisations, shared functions ##
-#######################################
+# Initialisations, shared functions {{{1
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 {{{2
# Recreate the playlists : in Music
-
DestroyFunc Music-Start
AddToFunc Music-Start
+ I Exec exec $0
@@ -74,24 +38,20 @@
+ I AddToMenu /Player '$[gt.Stop player]' Music-Kill
+ 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
-################################
+# Second button {{{1
+# Player controls and main vol
+# mouse 1 Menu /Playlist-button {{{2
DestroyFunc FuncFvwmMenuAudioDirectory
AddToFunc FuncFvwmMenuAudioDirectory
+ I PipeRead 'case "$0" in \
- "$[AudioPlaylists]"*) myexec="alsaplayer -e";; \
- "$[UserManagedAudioPlaylists]"*) myexec="alsaplayer -e";; \
+ "$[infostore.AudioPlaylists]"*) myexec="alsaplayer -e";; \
+ "$[infostore.UserManagedAudioPlaylists]"*) myexec="alsaplayer -e";; \
esac; \
test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
test -f "$0"/.media.png && mypng="$0"/.media.png; \
@@ -104,8 +64,8 @@
AddToMenu /Music/LoadPlaylist
+ '$[gt.Choose playlist to load]' Nop
+ 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
@@ -133,13 +93,7 @@
AddToFunc Playlist-generator-button
+ I DestroyMenu recreate /Playlist-button
+ I AddToMenu /Playlist-button '$[gt.Playlists operations]' Nop
-## The following line will screw up the menu. One time on two, it work well,
-## the other time /Music/LoadPlaylist and /Music/RemovePlaylist get shifted.
-## As workaround, I added a title in this menu... How much time to find it!
-## Damn, it doesn't work with /music! the whole menu get screwed with this.
-## At least, it work from the button. I don't have any fix for /Music at that time.
+ I AddToMenu /Playlist-button '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
-##
+ I AddToMenu /Playlist-button '$[gt.Clear playlist]' Music-ClearPlaylist
+ I AddToMenu /Playlist-button '$[gt.Load playlist]' Popup /Music/LoadPlaylist
@@ -147,8 +101,7 @@
AddToMenu /Playlist-button
+ DynamicPopupAction Function Playlist-generator-button
-## mouse 2 Menu /Playback
-#########################
+# mouse 2 Menu /Playback {{{2
DestroyFunc Music-Next
AddToFunc Music-Next
+ I Exec exec alsaplayer --next
@@ -198,7 +151,7 @@
DestroyFunc Music-PlayPause
AddToFunc Music-PlayPause
-+ I Exec exec alsaplayer --speed $[speed] > /dev/null
++ I Exec exec alsaplayer --speed $[infostore.speed] > /dev/null
DestroyFunc Music-Jump
AddToFunc Music-Jump
@@ -254,18 +207,15 @@
+ I AddToMenu /Playback '$[gt.Jump]' Popup /Music/Jump
+ I AddToMenu /Playback '$[gt.Seek]' Popup /Music/Seek
-## 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
DestroyFunc Music-VolumeFr
AddToFunc Music-VolumeFr
@@ -279,48 +229,43 @@
AddToMenu /Music/Volume
+ '$[gt.Player volume]' Nop
+ "" Nop
-Test (EnvMatch dec_point ",") + " 0 dB" Music-VolumeFr '1,0'
-Test (EnvMatch dec_point ",") + "-3 dB" Music-VolumeFr '0,707'
-Test (EnvMatch dec_point ",") + "-6 dB" Music-VolumeFr '0,5'
-Test (EnvMatch dec_point ",") + "-12 dB" Music-VolumeFr '0,25'
-Test (EnvMatch dec_point ",") + "-18 dB" Music-VolumeFr '0,125'
-Test (EnvMatch dec_point ",") + "-24 dB" Music-VolumeFr '0,0625'
-Test (EnvMatch dec_point ",") + "-30 dB" Music-VolumeFr '0,03125'
-Test (EnvMatch dec_point ",") + "-36 dB" Music-VolumeFr '0,015625'
-Test (EnvMatch dec_point ",") + " 0" Music-VolumeFr '0,0'
-Test (EnvMatch dec_point ".") + " 0 dB" Music-VolumeEn '1.0'
-Test (EnvMatch dec_point ".") + "-3 dB" Music-VolumeEn '0.707'
-Test (EnvMatch dec_point ".") + "-6 dB" Music-VolumeEn '0.5'
-Test (EnvMatch dec_point ".") + "-12 dB" Music-VolumeEn '0.25'
-Test (EnvMatch dec_point ".") + "-18 dB" Music-VolumeEn '0.125'
-Test (EnvMatch dec_point ".") + "-24 dB" Music-VolumeEn '0.0625'
-Test (EnvMatch dec_point ".") + "-30 dB" Music-VolumeEn '0.03125'
-Test (EnvMatch dec_point ".") + "-36 dB" Music-VolumeEn '0.015625'
-Test (EnvMatch dec_point ".") + " 0" Music-VolumeEn '0.0'
+PipeRead 'if [[ $[infostore.dec_point] == "," ]] ; then \\
+ echo "+ \\" 0 dB\\" Music-VolumeFr 1,0"; \\
+ echo "+ \\"-3 dB\\" Music-VolumeFr \'0,707\'"; \\
+ echo "+ \\"-6 dB\\" Music-VolumeFr \'0,5\'"; \\
+ echo "+ \\"-12 dB\\" Music-VolumeFr \'0,25\'"; \\
+ echo "+ \\"-18 dB\\" Music-VolumeFr \'0,125\'"; \\
+ echo "+ \\"-24 dB\\" Music-VolumeFr \'0,0625\'"; \\
+ echo "+ \\"-30 dB\\" Music-VolumeFr \'0,03125\'"; \\
+ echo "+ \\"-36 dB\\" Music-VolumeFr \'0,015625\'"; \\
+ echo "+ \\" 0\\" Music-VolumeFr \'0,0\'"; \\
+ else \\
+ echo "+ \\" 0 dB\\" Music-VolumeEn 1.0"; \\
+ echo "+ \\"-3 dB\\" Music-VolumeEn \'0.707\'"; \\
+ echo "+ \\"-6 dB\\" Music-VolumeEn \'0.5\'"; \\
+ echo "+ \\"-12 dB\\" Music-VolumeEn \'0.25\'"; \\
+ echo "+ \\"-18 dB\\" Music-VolumeEn \'0.125\'"; \\
+ echo "+ \\"-24 dB\\" Music-VolumeEn \'0.0625\'"; \\
+ echo "+ \\"-30 dB\\" Music-VolumeEn \'0.03125\'"; \\
+ echo "+ \\"-36 dB\\" Music-VolumeEn \'0.015625\'"; \\
+ echo "+ \\" 0\\" Music-VolumeEn \'0.0\'"; fi'
-## mouse 4 Music-Speed-Up
-## mouse 5 Music-Speed-Down
-###########################
+# mouse 4 Music-Speed-Up {{{2
+# mouse 5 Music-Speed-Down
DestroyFunc Music-Speed-Up
AddToFunc Music-Speed-Up
-+ I PipeRead 'echo SetEnv speed `$[FVWM_SYSTEMDIR]/scripts/speed_value +1comma`'
-+ I Exec exec alsaplayer --speed $[speed] > /dev/null
++ 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 'echo SetEnv speed `$[FVWM_SYSTEMDIR]/scripts/speed_value -1comma`'
-+ I Exec exec alsaplayer --speed $[speed] > /dev/null
++ 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 ###
-## speed controls ##
-####################
-## mouse 1 Menu /Speed
-######################
+# Last button {{{1
+# speed controls
+# mouse 1 Menu /Speed {{{2
DestroyFunc Music-Speed
AddToFunc Music-Speed
-+ I PipeRead 'echo SetEnv speed `$[FVWM_SYSTEMDIR]/scripts/speed_value $0`'
-+ I Exec exec alsaplayer --speed $[speed] > /dev/null
++ 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]`'
DestroyMenu /Speed
AddToMenu /Speed
@@ -352,7 +297,7 @@
+ "Normal" Music-Speed 'normal'
+ "-1 comma" Music-Speed '-1comma'
-## mouse 4 Button-Seek-+
+## mouse 4 Button-Seek-+ {{{2
## mouse 5 Button-Seek--
DestroyFunc Button-Seek-+
AddToFunc Button-Seek-+
@@ -362,12 +307,9 @@
AddToFunc Button-Seek--
+ I Music-Seek '-15'
-###############
-# Music menus #
-###############
+# Music menus {{{1
# Recipe without audio buttons use the following:
-# Popup /Music
-
+# Popup /Music {{{2
DestroyFunc Music-generator
AddToFunc Music-generator
+ I DestroyMenu recreate /Music
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-12 12:29:16
|
Revision: 223
http://sourceforge.net/p/fvwm-crystal/code/223
Author: dominique_libre
Date: 2013-04-12 12:29:13 +0000 (Fri, 12 Apr 2013)
Log Message:
-----------
We want those variables to be globals
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Xdg-User-Dirs
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-12 10:19:27 UTC (rev 222)
+++ ChangeLog 2013-04-12 12:29:13 UTC (rev 223)
@@ -2,8 +2,8 @@
Vendredi 12 Avril 2013 Dominique Michel
-+ functions/Xdg-User-Dirs: Set locale aware variables for well
- know user directories
++ functions/Xdg-User-Dirs: Set locale aware and global variables
+ for well know user directories
Jeudi 11 Avril 2013 Dominique Michel
FAQ: Added q.a. about tear off menus.
Modified: fvwm/components/functions/Xdg-User-Dirs
===================================================================
--- fvwm/components/functions/Xdg-User-Dirs 2013-04-12 10:19:27 UTC (rev 222)
+++ fvwm/components/functions/Xdg-User-Dirs 2013-04-12 12:29:13 UTC (rev 223)
@@ -1,15 +1,18 @@
# Support for localized user directories into Fvwm-Crystal
# Written by: Dominique Michel <dom...@so...> 2013
-# see /etc/xdg/user-dirs.defaults
+# see /etc/xdg/user-dirs.defaults and http://freedesktop.org/wiki/Software/xdg-user-dirs
+# Be sure the xdg user directories file exist in $HOME
+PipeRead 'test ! -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && xdg-user-dirs-update'
+
+# We want them to be globals for the user and with full path
PipeRead 'test -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && source ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs; \
-echo "InfoStoreAdd UserMusicDir ${XDG_MUSIC_DIR:-$HOME}"; \
-echo "InfoStoreAdd UserVideosDir ${XDG_VIDEOS_DIR:-$HOME}"'
+ echo SetEnv XDG_MUSIC_DIR ${XDG_MUSIC_DIR:-$HOME}; \
+ echo SetEnv XDG_VIDEOS_DIR ${XDG_VIDEOS_DIR:-$HOME}; \
+ echo SetEnv XDG_DESKTOP_DIR ${XDG_DESKTOP_DIR:-$HOME/Desktop}; \
+ echo SetEnv XDG_DOWNLOAD_DIR ${XDG_DOWNLOAD_DIR:-$HOME}; \
+ echo SetEnv XDG_TEMPLATES_DIR ${XDG_TEMPLATES_DIR:-$HOME}; \
+ echo SetEnv XDG_PUBLICSHARE_DIR ${XDG_PUBLICSHARE_DIR:-$HOME}; \
+ echo SetEnv XDG_DOCUMENTS_DIR ${XDG_DOCUMENTS_DIR:-$HOME}; \
+ echo SetEnv XDG_PICTURES_DIR ${XDG_PICTURES_DIR:-$HOME}'
-#echo "InfoStoreAdd UserDesktopDir ${XDG_DESKTOP_DIR:-$HOME/Desktop}"; \
-#echo "InfoStoreAdd UserDownloadDir ${XDG_DOWNLOAD_DIR:-$HOME}"; \
-#echo "InfoStoreAdd UserTemplatesDir ${XDG_TEMPLATES_DIR:-$HOME}"; \
-#echo "InfoStoreAdd UserPublicShareDir ${XDG_PUBLICSHARE_DIR:-$HOME}"; \
-#echo "InfoStoreAdd UserDocumentsDir ${XDG_DOCUMENTS_DIR:-$HOME}"; \
-#echo "InfoStoreAdd UserPicturesDir ${XDG_PICTURES_DIR:-$HOME}"; \
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-12 20:05:02
|
Revision: 226
http://sourceforge.net/p/fvwm-crystal/code/226
Author: dominique_libre
Date: 2013-04-12 20:04:55 +0000 (Fri, 12 Apr 2013)
Log Message:
-----------
+functions/Media: common file for multimedia players. components/Music-mplayer(2): moved some functions to components/Media; playlist functions cleanup; cleanup; playlist are locale aware.
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Music-mplayer
fvwm/components/functions/Music-mplayer2
Added Paths:
-----------
fvwm/components/functions/Media
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-12 18:12:07 UTC (rev 225)
+++ ChangeLog 2013-04-12 20:04:55 UTC (rev 226)
@@ -6,7 +6,10 @@
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;
+ introduced playlists localizations; playlist cleanup; clecup.
+
Jeudi 11 Avril 2013 Dominique Michel
FAQ: Added q.a. about tear off menus.
functions/Music-mplayer: fix glitch into the speed control; introduced
Added: fvwm/components/functions/Media
===================================================================
--- fvwm/components/functions/Media (rev 0)
+++ fvwm/components/functions/Media 2013-04-12 20:04:55 UTC (rev 226)
@@ -0,0 +1,386 @@
+# Multimedia support in Fvwm-Crystal:
+# 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
+#
+# 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:
+#
+# n button n button fumction comment
+# Button 1: (Mouse 1) Menu /Player # Main player menu
+# (Mouse 2) Music-GUI # show/hide the player
+# (Mouse 3) Music-QJackGUI # show/hide QJackCtl
+# (Mouse 4) Mixer-Volume-Up # main volume up
+# (Mouse 5) Mixer-Volume-Down # main volume down
+# Button 2: (Mouse 1) Menu /Playlist-button # playlist menu
+# (Mouse 2) Menu /Music/Volume # player volume menu
+# (Mouse 3) Menu /Mixer # main mixer menu
+# (Mouse 4) Music-Next # next media
+# (Mouse 5) Music-Prev # previous media
+# Button 3: (Mouse 1) Music-Play # play
+# (Mouse 2) Music-Pause # pause
+# (Mouse 3) Menu /Playback # playback menu
+# (Mouse 4) Music-Speed-Up # speed up
+# (Mouse 5) Music-Speed-Down # speed down
+# Button 4: (Mouse 1) Menu /Speed # speed control menu
+# (Mouse 4) Music-Seek-+ # seek forward
+# (Mouse 5) Music-Seek-- # seek backward
+# NOTE : the actual bindings are fixed into the recipes.
+#
+# Recipes with media menu: Clean, Clean Vertical, Light, Wing-Commander
+# The media menu is: Popup /Music
+#
+# If you try to launch both /Playlist-button and /Music in one recipe,
+# the menu /Music will get scruved. Auto-generated menus are very sensitive.
+# The only think to do is to not use both the media button and /Music into
+# the recipes, and wait and see if some future fvwm release will fix this.
+# For me, but I can be wrong on this, the way than fvwm-menu-directory use
+# to generate the menu when --reuse --name are not enabled seam to easily
+# confuse fvwm.
+#
+# TODO : - Move the media button here
+# - Find something to do with mouse 2 and 3 on button 4
+
+# Amixer and Mplayer are selected as default mixer and player if the user
+# didn't changed it. We keep them or the user settings.
+
+# The playlists are now in 4 places:
+# $[FVWM_USERDIR]/Playlists/Audio for the playlists of audio files
+# $[FVWM_USERDIR]/Playlists/Video for the playlists of movie files
+# $[HOME]/Playlists/Audio for "by the user managed" audio playlists
+# $[HOME]/Playlists/Video for "by the user managed" video playlists
+#
+# 'Recreate the playlist' will manage ~/Playlists/Audio and ~/Playlists/Video
+# in a very simple way: delete all and recreate all. At the same time, it will
+# create the user managed directories if they don't exist.
+#
+# 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
+
+# Mixer {{{1
+Include components/functions/Mixer
+
+# Variables {{{1
+# playlists location, needed by recereate playlists {{{2
+InfoStoreAdd AudioPlaylists "$[FVWM_USERDIR]/Playlists/Audio"
+InfoStoreAdd VideoPlaylists "$[FVWM_USERDIR]/Playlists/Video"
+InfoStoreAdd UserManagedAudioPlaylists "$[HOME]/Playlists/Audio"
+InfoStoreAdd UserManagedVideoPlaylists "$[HOME]/Playlists/Video"
+
+# speed control (alsaplayer, mplayer) {{{2
+# player normal speed (We want normal speed)
+InfoStoreAdd speed 1
+
+# Decimal point in use {{{2
+PipeRead 'if [[ $[MusicPlayer] == alsaplayer ]]; then echo "InfoStoreAdd dec_point `locale decimal_point`"; fi'
+
+# xmms2
+UnSetEnv fvwm_audio_exec
+
+# Styles for media players windows {{{1
+Style Alsaplayer NoActiveIconOverride, NoIcon, Sticky, WindowListSkip, StaysOnTop
+Style alsaplayer UseStyle Alsaplayer
+
+Style Audacious StaysOnTop
+Style Audacious StartIconic, NoActiveIconOverride, NoIcon, !Title, Sticky, WindowListSkip
+Style playlist StartIconic, NoIcon, !Title, Sticky, WindowListSkip
+Style equalizer UseStyle playlist
+
+Style beep-media-player !Title
+
+# Cmus (NoIcon doesn't work -> ToDo: use FvwmIdent)
+Style cmus NoActiveIconOverride, NoIcon, Sticky, WindowListSkip, StaysOnTop
+# Mocp (NoIcon doesn't work -> ToDo: use FvwmIdent)
+Style mocp NoActiveIconOverride, NoIcon, Sticky, WindowListSkip, StaysOnTop
+
+Style MPlayer !Title, !Borders, GnomeIgnoreHints, EWMHIgnoreStackingOrderHints
+Style "MPlayer - Video" Title, Borders, GnomeIgnoreHints, EWMHIgnoreStackingOrderHints
+Style XDRadio NoIcon, Sticky, WindowListSkip
+
+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 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
+# Recreate the playlists (all)
+DestroyFunc Music-RecreatePlaylist
+AddToFunc Music-RecreatePlaylist
++ I A $[FVWM_USERDIR]/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
+
+# player quit (alsaplayer, mplayer)
+DestroyFunc Music-Kill
+
+# 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
+
+# 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
+
+# Generate /Music/LoadMovie menu (mplayer)
+DestroyFunc FuncFvwmMenuMovieDirectory
+DestroyMenu /Music/LoadMovie
+
+# Load playlist (alsaplayer, audacious, mocp)
+DestroyFunc FuncFvwmMenuAudioDirectory
+# Load playlist (mpd, xmms2)
+DestroyFunc Music-LoadPlaylist-generator
+# Load playlist (alsaplayer, audacious, mocp, mpd, xmms2)
+DestroyMenu /Music/LoadPlaylist
+
+# Load Media Playlists (mplayer)
+DestroyFunc FuncFvwmMenuMediaDirectory
+AddToFunc FuncFvwmMenuMediaDirectory
++ I PipeRead 'case "$0" in \
+ "$[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; \
+ fvwm-menu-directory --icon-title "${mytitle:-22x22/categories/directory.png}" \
+ --icon-file "${mypng:-22x22/categories/Audio.png}" \
+ --func="FuncFvwmMenuMediaDirectory" \
+ --exec-file "^${myexec}" --dir "$0" \
+ --exec-t="^fvwm-crystal.play-movies $0"'
+
+DestroyMenu /Music/LoadMediaPlaylist
+AddToMenu /Music/LoadMediaPlaylist
++ MissingSubmenuFunction FuncFvwmMenuMediaDirectory
++ '%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]
+
+# Clear playlist (alsaplayer, audacious, mocp, mpd, xmms2)
+DestroyFunc Music-ClearPlaylist
+
+# Remove song (audacious, mpd, xmms2)
+DestroyFunc Music-RemoveSong
+
+# Remove playlist (audacious, mocp, mpd, xmms2)
+DestroyFunc Music-RemovePlaylist-generator
+# (alsaplayer, mplayer)
+DestroyFunc FuncFvwmMenuRemovePlaylistDirectory
+AddToFunc FuncFvwmMenuRemovePlaylistDirectory
++ I PipeRead 'case "$0" in \
+ "$[infostore.UserManagedAudioPlaylists]"*) myexec="rm -f";; \
+ "$[infostore.UserManagedVideoPlaylists]"*) myexec="rm -f";; \
+ 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.png}" \
+ --dir "$0" --exec-title "-" --exec-file "^${myexec}" \
+ --func-name "FuncFvwmMenuRemovePlaylistDirectory"'
+
+DestroyMenu /Music/RemovePlaylist
+AddToMenu /Music/RemovePlaylist
++ '$[gt.Choose playlist to remove]' Nop
++ MissingSubmenuFunction FuncFvwmMenuRemovePlaylistDirectory
++ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[infostore.UserManagedAudioPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[infostore.UserManagedVideoPlaylists]
+
+# 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
+
+# Copy playlist (alsaplayer, mplayer)
+DestroyFunc FuncFvwmMenuCopyPlaylistDirectory
+AddToFunc FuncFvwmMenuCopyPlaylistDirectory
++ I PipeRead 'case "$0" in \
+ "$[infostore.AudioPlaylists]"*) myexec="Exec cp -r \'%f\' \'$[infostore.UserManagedAudioPlaylists]\'";; \
+ "$[infostore.VideoPlaylists]"*) myexec="Exec cp -r \'%f\' \'$[infostore.UserManagedVideoPlaylists]\'";; \
+ 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.png}" \
+ --dir "$0" --exec-title "-" --command-file "${myexec}" \
+ --func-name "FuncFvwmMenuCopyPlaylistDirectory"'
+
+DestroyMenu /Music/CopyPlaylist
+AddToMenu /Music/CopyPlaylist
++ '$[gt.Choose playlist to copy]' Nop
++ MissingSubmenuFunction FuncFvwmMenuCopyPlaylistDirectory
++ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[infostore.AudioPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[infostore.AudioPlaylists]
+
+# button menu (alsaplayer, audacious, mocp, mpd, mplayer, xmms2)
+DestroyFunc Playlist-generator-button
+AddToFunc Playlist-generator-button
++ 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
++ 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
+
+DestroyMenu /Playlist-button
+AddToMenu /Playlist-button
++ DynamicPopupAction Function Playlist-generator-button
+
+# 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, xmms2
+DestroyFunc Music-Prev
+
+# alsaplayer
+DestroyFunc Music-SongChange
+DestroyMenu /Music/SongChange
+
+# 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
+
+# cdcd, cmus, mpd, quodlibet
+DestroyFunc Music-Forward
+
+# cdcd, cmus, mpd, quodlibet
+DestroyFunc Music-Backward
+
+# audacious, cmus, mpd, quodlibet
+DestroyFunc Music-ToggleRandom
+
+# alsaplayer, mplayer
+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--
+# alsaplayer
+DestroyFunc Button-Seek-+
+DestroyFunc Button-Seek--
+
+# 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-12 18:12:07 UTC (rev 225)
+++ fvwm/components/functions/Music-mplayer 2013-04-12 20:04:55 UTC (rev 226)
@@ -2,7 +2,7 @@
# Written by: Dominique Michel <dom...@so...> 2008-2013
# Load shared functions and initialisations {{{1
-Include components/functions/Music
+Include components/functions/Media
# Specific variables {{{1
# We must start mplayer in slave mode and send the commands via a pipe
@@ -24,8 +24,7 @@
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
DestroyFunc Music-GUI
AddToFunc Music-GUI
@@ -52,66 +51,15 @@
# 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://
-# Generate /Music/LoadMovie menu
+# Generate /Music/LoadMovie menu (mplayer)
PipeRead '$[FVWM_SYSTEMDIR]/scripts/media_directories $[infostore.USERDIR]'
Include tmp/MenuMovieDirectory
-DestroyFunc FuncFvwmMenuAudioDirectory
-AddToFunc FuncFvwmMenuAudioDirectory
-+ I PipeRead 'case "$0" in \
- "$[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; \
- fvwm-menu-directory --icon-title "${mytitle:-22x22/categories/directory.png}" \
- --icon-file "${mypng:-22x22/categories/Audio.png}" \
- --func="FuncFvwmMenuAudioDirectory" \
- --exec-file "^${myexec}" --dir "$0" \
- --exec-t="^fvwm-crystal.play-movies $0"'
-
-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.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 $[infostore.UserManagedAudioPlaylists]/*.{m3u,pls}; do \
- name=$(basename "$i"); \
- sname=${name%%.m3u}; \
- sname=${sname%%.pls}; \
- echo \"AddToMenu /Music/RemovePlaylist \'$sname\' Exec rm -f \'$i\'\"; done'
-
-DestroyMenu /Music/RemovePlaylist
-AddToMenu /Music/RemovePlaylist
-+ DynamicPopupAction Function Music-RemovePlaylist-generator
-
-DestroyFunc Playlist-generator-button
-AddToFunc Playlist-generator-button
-+ I DestroyMenu recreate /Playlist-button
-+ I AddToMenu /Playlist-button '$[gt.Play DVD]' Load-DVD
-+ I AddToMenu /Playlist-button '$[gt.Load media file]' Popup /Music/LoadMovie
-+ I AddToMenu /Playlist-button '$[gt.Load playlist]' Popup /Music/LoadPlaylist
-+ I AddToMenu /Playlist-button '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
-
-DestroyMenu /Playlist-button
-AddToMenu /Playlist-button
-+ DynamicPopupAction Function Playlist-generator-button
-
# mouse 2 Menu /Playback {{{2
DestroyFunc Music-Pause
AddToFunc Music-Pause
@@ -195,11 +143,7 @@
AddToFunc Music-Play
+ I Exec exec echo "frame_step" > /home/$[infostore.USERDIR]/.mplayer/pipe
-# mouse 2 Music-PlayPause
-#DestroyFunc Music-PlayPause
-#AddToFunc Music-PlayPause
-#+ I Exec exec echo "pause" > /home/$[infostore.USERDIR]/.mplayer/pipe
-
+# mouse 2 Music-PlayPause : allready here {{{2
# mouse 3 Menu /Music/Volume {{{2
DestroyFunc Music-Volume
AddToFunc Music-Volume
@@ -297,17 +241,20 @@
+ I DestroyMenu recreate /Playlist
+ 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
++ I AddToMenu /Playlist '$[gt.Load playlist]' Popup /Music/LoadMediaPlaylist
#+ I AddToMenu /Playlist '$[gt.Clear playlist]' Music-ClearPlaylist
-#+ I AddToMenu /Playlist '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
++ 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 playlist]' Popup /Music/LoadMediaPlaylist
+ I AddToMenu /Playlist-bot '$[gt.Load media file]' Popup /Music/LoadMovie
+ I AddToMenu /Playlist-bot '$[gt.Play DVD]' Load-DVD
#+ 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
@@ -318,8 +265,9 @@
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.Show/Hide GUI]' Music-GUI
+ I AddToMenu /Music '$[gt.Playback]' Popup /Playback
++ I AddToMenu /Music '$[gt.Load]' 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
Modified: fvwm/components/functions/Music-mplayer2
===================================================================
--- fvwm/components/functions/Music-mplayer2 2013-04-12 18:12:07 UTC (rev 225)
+++ fvwm/components/functions/Music-mplayer2 2013-04-12 20:04:55 UTC (rev 226)
@@ -2,7 +2,7 @@
# Written by: Dominique Michel <dominique_libreourceforge.net> 2009-2013
# Initialisations, shared functions {{{1
-Include components/functions/Music
+Include components/functions/Media
# Variables {{{1
# We must start mplayer2 in slave mode and send the commands via a pipe
@@ -28,7 +28,6 @@
DestroyFunc Music-GUI
AddToFunc Music-GUI
-#+ I Exec exec echo "menu up" > /home/$[infostore.USERDIR]/.mplayer/pipe
+ I All (XDRadio) Iconify toggle
DestroyFunc Player-generator
@@ -57,60 +56,10 @@
#+ I Exec exec fvwm-crystal.mplayer-wrapper dvd $[infostore.USERDIR]
+ I Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvdnav://
-# Generate /Music/LoadMovie menu
+# Generate /Music/LoadMovie menu (mplayer)
PipeRead '$[FVWM_SYSTEMDIR]/scripts/media_directories $[infostore.USERDIR]'
Include tmp/MenuMovieDirectory
-DestroyFunc FuncFvwmMenuAudioDirectory
-AddToFunc FuncFvwmMenuAudioDirectory
-+ I PipeRead 'case "$0" in \
- "$[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; \
- fvwm-menu-directory --icon-title "${mytitle:-22x22/categories/directory.png}" \
- --icon-file "${mypng:-22x22/categories/Audio.png}" \
- --func="FuncFvwmMenuAudioDirectory" \
- --exec-file "^${myexec}" --dir "$0" \
- --exec-t="^fvwm-crystal.play-movies $0"'
-
-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]
-+ '%22x22/categories/video_movies_view.png%$[gt.Video playlists]' Popup $[infostore.VideoPlaylists]
-+ '%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 $[infostore.UserManagedAudioPlaylists]/*.{m3u,pls}; do \
- name=$(basename "$i"); \
- sname=${name%%.m3u}; \
- sname=${sname%%.pls}; \
- echo \"AddToMenu /Music/RemovePlaylist \'$sname\' Exec rm -f \'$i\'\"; done'
-
-DestroyMenu /Music/RemovePlaylist
-AddToMenu /Music/RemovePlaylist
-+ DynamicPopupAction Function Music-RemovePlaylist-generator
-
-DestroyFunc Playlist-generator-button
-AddToFunc Playlist-generator-button
-+ I DestroyMenu recreate /Playlist-button
-+ I AddToMenu /Playlist-button '$[gt.Play DVD]' Load-DVD
-+ I AddToMenu /Playlist-button '$[gt.Load media file]' Popup /Music/LoadMovie
-+ I AddToMenu /Playlist-button '$[gt.Load playlist]' Popup /Music/LoadPlaylist
-+ I AddToMenu /Playlist-button '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
-
-DestroyMenu /Playlist-button
-AddToMenu /Playlist-button
-+ DynamicPopupAction Function Playlist-generator-button
-
# mouse 2 Menu /Playback {{{1
DestroyFunc Music-Pause
AddToFunc Music-Pause
@@ -294,7 +243,8 @@
+ I AddToMenu /Playlist '$[gt.Load media file]' Popup /Music/LoadMovie
+ I AddToMenu /Playlist '$[gt.Load playlist]' Popup /Music/LoadPlaylist
#+ I AddToMenu /Playlist '$[gt.Clear playlist]' Music-ClearPlaylist
-#+ I AddToMenu /Playlist '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
++ 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
@@ -303,6 +253,8 @@
+ I AddToMenu /Playlist-bot '$[gt.Load media file]' Popup /Music/LoadMovie
+ I AddToMenu /Playlist-bot '$[gt.Play DVD]' Load-DVD
#+ 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
@@ -313,8 +265,9 @@
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.Show/Hide GUI]' Music-GUI
+ I AddToMenu /Music '$[gt.Playback]' Popup /Playback
++ I AddToMenu /Music '$[gt.Load]' 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.
|
|
From: <dom...@us...> - 2013-04-12 21:46:42
|
Revision: 228
http://sourceforge.net/p/fvwm-crystal/code/228
Author: dominique_libre
Date: 2013-04-12 21:46:36 +0000 (Fri, 12 Apr 2013)
Log Message:
-----------
components/Music: playlists localization; components/Music-alsaplayer: playlist localization; +playlist copy function
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Music
fvwm/components/functions/Music-alsaplayer
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-12 20:13:31 UTC (rev 227)
+++ ChangeLog 2013-04-12 21:46:36 UTC (rev 228)
@@ -8,8 +8,12 @@
directories
+ components/Media: common file for multimedia players
components/Music-mplayer(2): moved some functions to vomponents/Media;
- introduced playlists localizations; playlist cleanup; clecup.
-
+ 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
+ function
+
Jeudi 11 Avril 2013 Dominique Michel
FAQ: Added q.a. about tear off menus.
functions/Music-mplayer: fix glitch into the speed control; introduced
Modified: fvwm/components/functions/Music
===================================================================
--- fvwm/components/functions/Music 2013-04-12 20:13:31 UTC (rev 227)
+++ fvwm/components/functions/Music 2013-04-12 21:46:36 UTC (rev 228)
@@ -1,6 +1,6 @@
# Support for audio players in Fvwm-Crystal:
# initialisations and some shared functions
-# Written by: Dominique Michel <dom...@so...>
+# Written by: Dominique Michel <dom...@us...>
#
# This file must be included at the top of the music player control files.
# Include components/functions/MediaButtons
@@ -41,7 +41,7 @@
# to generate the menu when --reuse --name are not enabled seam to easily
# confuse fvwm.
#
-# TODO : - Move the media button here (Idea: one function per button)
+# TODO : - Move the media button here
# - Find something to do with mouse 2 and 3 on button 4
#############################################################################
@@ -51,33 +51,28 @@
###########################################################################
# 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
+# $[FVWM_USERDIR]/Playlists/Audio for the playlists of audio files
+# $[FVWM_USERDIR]/Playlists/Video for the playlists of movie files
+# $[HOME]/Playlists/Audio for "by the user managed" audio playlists
+# $[HOME]/Playlists/Video for "by the user managed" video playlists
#
-# 'Recreate the playlist' will manage ~/Playlists/Audio and ~/Playlists/Video
-# in a very simple way: delete all and recreate all. At the same time, it will
+# 'Recreate the playlist' will manage the playlists in $[FVWM_USERDIR] in a
+# very simple way: delete all and recreate all. At the same time, it will
# create the user managed directories if they don't exist.
#
-# Todo: function AddFavorite (add a playlist from ~/Playlists/Audio or
-# ~/Playlists/Video to the "by the user managed" playlists
-#
# 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
# Mixer {{{1
Include components/functions/Mixer
# 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\\\""
+# playlists locations {{{2
+InfoStoreAdd AudioPlaylists "$[FVWM_USERDIR]/Playlists/Audio"
+InfoStoreAdd VideoPlaylists "$[FVWM_USERDIR]/Playlists/Video"
+InfoStoreAdd UserManagedAudioPlaylists "$[HOME]/Playlists/Audio"
+InfoStoreAdd UserManagedVideoPlaylists "$[HOME]/Playlists/Video"
# speed control (alsaplayer, mplayer) {{{2
# player normal speed (We want normal speed)
@@ -212,6 +207,14 @@
# Update the database (mpd)
DestroyFunc Music-Update
+# Load Media Playlists (mplayer)
+DestroyFunc FuncFvwmMenuMediaDirectory
+DestroyMenu /Music/LoadMediaPlaylist
+
+# Copy playlist (alsaplayer, mplayer)
+DestroyFunc FuncFvwmMenuCopyPlaylistDirectory
+DestroyMenu /Music/CopyPlaylist
+
# button menu (alsaplayer, audacious, mocp, mpd, mplayer, xmms2)
DestroyFunc Playlist-generator-button
DestroyMenu /Playlist-button
Modified: fvwm/components/functions/Music-alsaplayer
===================================================================
--- fvwm/components/functions/Music-alsaplayer 2013-04-12 20:13:31 UTC (rev 227)
+++ fvwm/components/functions/Music-alsaplayer 2013-04-12 21:46:36 UTC (rev 228)
@@ -74,7 +74,7 @@
DestroyFunc FuncFvwmMenuRemovePlaylistDirectory
AddToFunc FuncFvwmMenuRemovePlaylistDirectory
+ I PipeRead 'case "$0" in \
- "$[NonManagedPlaylists]"*) myexec="rm -f";; \
+ "$[infostore.UserManagedAudioPlaylists]"*) myexec="rm -f";; \
esac; \
test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
test -f "$0"/.media.png && mypng="$0"/.media.png; \
@@ -87,13 +87,33 @@
AddToMenu /Music/RemovePlaylist
+ '$[gt.Choose playlist to remove]' Nop
+ MissingSubmenuFunction FuncFvwmMenuRemovePlaylistDirectory
-+ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[NonManagedPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[infostore.UserManagedAudioPlaylists]
+DestroyFunc FuncFvwmMenuCopyPlaylistDirectory
+AddToFunc FuncFvwmMenuCopyPlaylistDirectory
++ I PipeRead 'case "$0" in \
+ "$[infostore.AudioPlaylists]"*) myexec="Exec cp -r \'%f\' \'$[infostore.UserManagedAudioPlaylists]\'";; \
+ 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.png}" \
+ --dir "$0" --exec-title "-" --command-file "${myexec}" \
+ --func-name "FuncFvwmMenuCopyPlaylistDirectory"'
+
+DestroyMenu /Music/CopyPlaylist
+AddToMenu /Music/CopyPlaylist
++ '$[gt.Choose playlist to copy]' Nop
++ MissingSubmenuFunction FuncFvwmMenuCopyPlaylistDirectory
++ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[infostore.AudioPlaylists]
+
+
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.Copy playlist]' Popup /Music/CopyPlaylist
+ I AddToMenu /Playlist-button '$[gt.Clear playlist]' Music-ClearPlaylist
+ I AddToMenu /Playlist-button '$[gt.Load playlist]' Popup /Music/LoadPlaylist
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-12 22:09:10
|
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.
|
|
From: <dom...@us...> - 2013-04-13 09:36:28
|
Revision: 232
http://sourceforge.net/p/fvwm-crystal/code/232
Author: dominique_libre
Date: 2013-04-13 09:36:25 +0000 (Sat, 13 Apr 2013)
Log Message:
-----------
functions/Music-audacious: -menu: added preferences and recreate playlist
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Music-audacious
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-13 09:33:10 UTC (rev 231)
+++ ChangeLog 2013-04-13 09:36:25 UTC (rev 232)
@@ -1,5 +1,10 @@
ChangeLog for FVWM-Crystal
+Samedi 13 Avril 2013 Dominique Michel
+
+ functions/Music-audacious: -menu: added preferences and recreate
+ playlist
+
Vendredi 12 Avril 2013 Dominique Michel
+ functions/Xdg-User-Dirs: Set locale aware and global variables
Modified: fvwm/components/functions/Music-audacious
===================================================================
--- fvwm/components/functions/Music-audacious 2013-04-13 09:33:10 UTC (rev 231)
+++ fvwm/components/functions/Music-audacious 2013-04-13 09:36:25 UTC (rev 232)
@@ -198,6 +198,9 @@
+ I AddToMenu /Music '$[gt.Start Audacious]' Exec exec audacious
+ I AddToMenu /Music '$[gt.Stop Audacious]' Exec exec audtool --shutdown
+ I AddToMenu /Music '$[gt.Play/Pause]' Music-PlayPause
++ I AddToMenu /Music "" Nop
++ I AddToMenu /Music '$[gt.Recreate the Playlists]' Music-RecreatePlaylist
++ I AddToMenu /Music '$[gt.Music player]' Popup /Preferences/MusicPlayer
DestroyMenu /Music
AddToMenu /Music
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-13 19:45:00
|
Revision: 234
http://sourceforge.net/p/fvwm-crystal/code/234
Author: dominique_libre
Date: 2013-04-13 19:44:57 +0000 (Sat, 13 Apr 2013)
Log Message:
-----------
functions/Music: RecreatePlaylist use the new syntax
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Media
fvwm/components/functions/Music
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-13 19:10:16 UTC (rev 233)
+++ ChangeLog 2013-04-13 19:44:57 UTC (rev 234)
@@ -7,6 +7,7 @@
FAQ: Added Q 3.5
+ addons/translatechars; +addons/translatefilenames: pre alpha quality
scripts to remove special characters in files and directories names.
+ functions/Music: RecreatePlaylist use the new syntax.
Vendredi 12 Avril 2013 Dominique Michel
Modified: fvwm/components/functions/Media
===================================================================
--- fvwm/components/functions/Media 2013-04-13 19:10:16 UTC (rev 233)
+++ fvwm/components/functions/Media 2013-04-13 19:44:57 UTC (rev 234)
@@ -33,14 +33,6 @@
# Recipes with media menu: Clean, Clean Vertical, Light, Wing-Commander
# The media menu is: Popup /Music
#
-# If you try to launch both /Playlist-button and /Music in one recipe,
-# the menu /Music will get scruved. Auto-generated menus are very sensitive.
-# The only think to do is to not use both the media button and /Music into
-# the recipes, and wait and see if some future fvwm release will fix this.
-# For me, but I can be wrong on this, the way than fvwm-menu-directory use
-# to generate the menu when --reuse --name are not enabled seam to easily
-# confuse fvwm.
-#
# TODO : - Move the media button here
# - Find something to do with mouse 2 and 3 on button 4
@@ -123,7 +115,7 @@
# Recreate the playlists (all)
DestroyFunc Music-RecreatePlaylist
AddToFunc Music-RecreatePlaylist
-+ I A $[FVWM_USERDIR]/scripts/make_all_playlists $[infostore.AudioPlaylists] $[infostore.VideoPlaylists] $[infostore.UserManagedAudioPlaylists] $[infostore.UserManagedVideoPlaylists]
++ I A $[FVWM_SYSTEMDIR]/scripts/make_all_playlists $[infostore.AudioPlaylists] $[infostore.VideoPlaylists] $[infostore.UserManagedAudioPlaylists] $[infostore.UserManagedVideoPlaylists]
# wrapper for cdcd
DestroyFunc Music-cdcd
Modified: fvwm/components/functions/Music
===================================================================
--- fvwm/components/functions/Music 2013-04-13 19:10:16 UTC (rev 233)
+++ fvwm/components/functions/Music 2013-04-13 19:44:57 UTC (rev 234)
@@ -33,14 +33,6 @@
# Recipes with media menu: Clean, Clean Vertical, Light, Wing-Commander
# The media menu is: Popup /Music
#
-# If you try to launch both /Playlist-button and /Music in one recipe,
-# the menu /Music will get scruved. Auto-generated menus are very sensitive.
-# The only think to do is to not use both the media button and /Music into
-# the recipes, and wait and see if some future fvwm release will fix this.
-# For me, but I can be wrong on this, the way than fvwm-menu-directory use
-# to generate the menu when --reuse --name are not enabled seam to easily
-# confuse fvwm.
-#
# TODO : - Move the media button here
# - Find something to do with mouse 2 and 3 on button 4
#############################################################################
@@ -125,7 +117,7 @@
# Recreate the playlists (all)
DestroyFunc Music-RecreatePlaylist
AddToFunc Music-RecreatePlaylist
-+ I A $[FVWM_SYSTEMDIR]/scripts/make_all_playlists $[infostore.AudioPlaylists] $[infostore.VideoPlaylists]
++ I A $[FVWM_SYSTEMDIR]/scripts/make_all_playlists $[infostore.AudioPlaylists] $[infostore.VideoPlaylists] $[infostore.UserManagedAudioPlaylists] $[infostore.UserManagedVideoPlaylists]
# wrapper for cdcd
DestroyFunc Music-cdcd
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <dom...@us...> - 2013-04-15 22:03:34
|
Revision: 242
http://sourceforge.net/p/fvwm-crystal/code/242
Author: dominique_libre
Date: 2013-04-15 22:03:30 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
functions/Music-ccleanup; added preferences and playlist menumus:
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Music-cmus
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-15 19:00:58 UTC (rev 241)
+++ ChangeLog 2013-04-15 22:03:30 UTC (rev 242)
@@ -4,6 +4,7 @@
+ Export.README: Free Export Regulations rules
recipes/Amiga: moved the SetEnv to InfoStore
+ functions/Music-cmus: cleanup; added prefernces and playlist menu
Samedi 13 Avril 2013 Dominique Michel
Modified: fvwm/components/functions/Music-cmus
===================================================================
--- fvwm/components/functions/Music-cmus 2013-04-15 19:00:58 UTC (rev 241)
+++ fvwm/components/functions/Music-cmus 2013-04-15 22:03:30 UTC (rev 242)
@@ -1,7 +1,8 @@
# Support for C* Music Player
# Written by: Maciej Delmanowski <ha...@po...>
# 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 C* Music Player
@@ -11,18 +12,13 @@
# Initialisations, shared functions
Include components/functions/Music
-###################
-## First button ###
-## Player controls and prefs ##
-###############################
-## mouse 1 Menu /Player
-#######################
-DestroyFunc Music-GUI
+# First button
+# Player controls and prefs {{{1
+# mouse 1 Menu /Player {{{2
AddToFunc Music-GUI
+ I All (cmus) 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
@@ -33,58 +29,66 @@
+ I AddToMenu /Player '$[gt.Start C* Music Player]' AT cmus cmus
+ I AddToMenu /Player '$[gt.Stop player]' Exec exec killall -9 cmus
-## 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
+# Player controls and main vol
+# mouse 1 Menu /Playlist-button {{{2
+
+# /Music/LoadPlaylist
+AddToFunc FuncFvwmMenuAudioDirectory
++ I PipeRead 'case "$0" in \
+ "$[infostore.AudioPlaylists]"*) myexec="cmus-remote -l";; \
+ "$[infostore.UserManagedAudioPlaylists]"*) myexec="cmus-remote -l";; \
+ 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.png}" \
+ --dir "$0" --exec-title "-" --exec-file "^${myexec}" \
+ --func-name "FuncFvwmMenuAudioDirectory"'
+
+AddToFunc Playlist-generator-button
++ I DestroyMenu recreate /Playlist-button
++ 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.Load playlist]' Popup /Music/LoadPlaylist
+
+AddToMenu /Playlist-button
++ DynamicPopupAction Function Playlist-generator-button
+
+# mouse 2 Menu /Playback
AddToFunc Music-Next
+ I Exec cmus-remote --next > /dev/null
-DestroyFunc Music-Prev
AddToFunc Music-Prev
+ I Exec cmus-remote --prev > /dev/null
-DestroyFunc Music-ToggleRandom
AddToFunc Music-ToggleRandom
+ I Exec cmus-remote --shuffle > /dev/null
-DestroyFunc Music-Stop
AddToFunc Music-Stop
+ I Exec cmus-remote --stop > /dev/null
-DestroyFunc Music-Play
AddToFunc Music-Play
+ I Exec cmus-remote --play > /dev/null
-DestroyFunc Music-Pause
AddToFunc Music-Pause
+ I Exec cmus-remote --pause > /dev/null
-DestroyFunc Music-PlayPause
AddToFunc Music-PlayPause
+ I Exec cmus-remote --pause > /dev/null
-DestroyFunc Music-Forward
AddToFunc Music-Forward
+ I Exec cmus-remote --shuffle > /dev/null; cmus-remote --next > /dev/null; cmus-remote --shuffle > /dev/null
-DestroyFunc Music-Backward
AddToFunc Music-Backward
+ I Exec cmus-remote --shuffle > /dev/null; cmus-remote --prev > /dev/null; cmus-remote --shuffle > /dev/null
-DestroyFunc Playback-generator
AddToFunc Playback-generator
+ I DestroyMenu recreate /Playback
+ I AddToMenu /Playback '$[gt.Next]' Music-Next
@@ -98,15 +102,36 @@
+ I AddToMenu /Playback '$[gt.Forward]' Music-Forward
+ I AddToMenu /Playback '$[gt.Backward]' Music-Backward
-# ---------------------------------------------------------------------------
-# Main menu
-DestroyMenu /Music
-AddToMenu /Music
-+ '$[gt.Volume]' Popup /Mixer
-+ '$[gt.Toggle random]' Music-ToggleRandom
-+ '$[gt.Toggle repeat]' Exec mpc repeat
+# Main menu {{{1
+AddToFunc Music-generator
++ I DestroyMenu recreate /Music
++ I AddToMenu /Music '$[gt.Volume]' Popup /Mixer
++ I AddToMenu /Music '$[gt.Toggle random]' Music-ToggleRandom
++ I AddToMenu /Music '$[gt.Toggle repeat]' Exec mpc repeat
++ I AddToMenu /Music "" Nop
++ I AddToMenu /Music '$[gt.Stop playback]' Music-Stop
++ I AddToMenu /Music '$[gt.Play/Pause]' Music-PlayPause
++ I AddToMenu /Music "" Nop
++ I AddToMenu /Music '$[gt.Load playlist]' Popup /Music/LoadPlaylist
++ I AddToMenu /Music '$[gt.Music player]' Popup /Preferences/MusicPlayer
+
+# Fake button functions see Music-cdcd {{{1
+
+# Menu /Music/Volume (TODO)
+AddToMenu /Music/Volume
+ "" Nop
-+ '$[gt.Stop playback]' Music-Stop
-+ '$[gt.Play/Pause]' Music-PlayPause
+# 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.
|
|
From: <dom...@us...> - 2013-04-16 16:04:20
|
Revision: 243
http://sourceforge.net/p/fvwm-crystal/code/243
Author: dominique_libre
Date: 2013-04-16 16:04:17 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
functions/Music-mocp: cleanup; added preferences & player menu when missing
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Music
fvwm/components/functions/Music-mocp
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-15 22:03:30 UTC (rev 242)
+++ ChangeLog 2013-04-16 16:04:17 UTC (rev 243)
@@ -4,7 +4,8 @@
+ Export.README: Free Export Regulations rules
recipes/Amiga: moved the SetEnv to InfoStore
- functions/Music-cmus: cleanup; added prefernces and playlist menu
+ functions/Music-cmus; functions/Music-mocp: cleanup; added prefernces
+ and playlist menu
Samedi 13 Avril 2013 Dominique Michel
Modified: fvwm/components/functions/Music
===================================================================
--- fvwm/components/functions/Music 2013-04-15 22:03:30 UTC (rev 242)
+++ fvwm/components/functions/Music 2013-04-16 16:04:17 UTC (rev 243)
@@ -91,6 +91,7 @@
Style cmus NoActiveIconOverride, NoIcon, Sticky, WindowListSkip, StaysOnTop
# Mocp (NoIcon doesn't work -> ToDo: use FvwmIdent)
Style mocp NoActiveIconOverride, NoIcon, Sticky, WindowListSkip, StaysOnTop
+Style MOC UseStyle mocp
Style MPlayer !Title, !Borders, GnomeIgnoreHints, EWMHIgnoreStackingOrderHints
Style "MPlayer - Video" Title, Borders, GnomeIgnoreHints, EWMHIgnoreStackingOrderHints
@@ -237,7 +238,7 @@
# mpd, xmms2
DestroyFunc Music-Shuffle
-# (alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, mocp, mpd, mplayer, quodlibet, xmms2)
+# (all)
DestroyFunc Playback-generator
# alsaplayer
Modified: fvwm/components/functions/Music-mocp
===================================================================
--- fvwm/components/functions/Music-mocp 2013-04-15 22:03:30 UTC (rev 242)
+++ fvwm/components/functions/Music-mocp 2013-04-16 16:04:17 UTC (rev 243)
@@ -1,25 +1,20 @@
# Support for 'Music On Console' music player
# Written by: Maciej Delmanowski <ha...@po...>
# Modded by: rysiul <tu...@o2...>
-# 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
-#######################
-DestroyFunc Music-GUI
+# First button {{{1
+# Player controls and prefs
+# mouse 1 Menu /Player {{{2
AddToFunc Music-GUI
+ I All (mocp) Close
+ I TestRc (NoMatch) None (mocp) AT mocp mocp
# 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
@@ -31,24 +26,19 @@
+ I AddToMenu /Player '$[gt.Stop player]' Exec exec killall -9 mocp
+ 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
-################################
-DestroyFunc FuncFvwmMenuAudioDirectory
+# Second button {{{1
+# Player controls and main vol
+# mouse 1 Menu /Playlist-button {{{1
AddToFunc FuncFvwmMenuAudioDirectory
+ I PipeRead 'case "$0" in \
- "$[AudioPlaylists]"*) myexec="mocp --sync --append";; \
- "$[UserManagedAudioPlaylists]"*) myexec="mocp --sync --append";; \
+ "$[infostore.AudioPlaylists]"*) myexec="mocp --sync --append";; \
+ "$[infostore.UserManagedAudioPlaylists]"*) myexec="mocp --sync --append";; \
esac; \
test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
test -f "$0"/.media.png && mypng="$0"/.media.png; \
@@ -58,64 +48,38 @@
--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 $[AudioPlaylists]
-+ '%22x22/categories/video_movies_view.png%$[gt.Personal audio playlists]' Popup $[UserManagedAudioPlaylists]
-
-DestroyFunc Music-ClearPlaylist
AddToFunc Music-ClearPlaylist
+ I Exec exec mocp --sync --clear
-DestroyFunc Music-RemovePlaylist-generator
-AddToFunc Music-RemovePlaylist-generator
-+ I DestroyMenu recreate /Music/RemovePlaylist
-+ I AddToMenu /Music/RemovePlaylist
-+ I PipeRead 'for i in $[NonManagedPlaylists]/*.{m3u,pls}; do name=$(basename "$i"); sname=${name%%.m3u}; sname=${sname%%.pls}; echo \"AddToMenu /Music/RemovePlaylist \'$sname\' Exec rm -f \'$i\'\"; done'
-
-DestroyMenu /Music/RemovePlaylist
-AddToMenu /Music/RemovePlaylist
-+ DynamicPopupAction Function Music-RemovePlaylist-generator
-
-DestroyFunc Playlist-generator-button
AddToFunc Playlist-generator-button
+ I DestroyMenu recreate /Playlist-button
++ 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
-+ I AddToMenu /Playlist-button '$[gt.Clear playlist]' Music-ClearPlaylist
-+ I AddToMenu /Playlist-button '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
-DestroyMenu /Playlist-button
AddToMenu /Playlist-button
+ DynamicPopupAction Function Playlist-generator-button
-## mouse 2 Menu /Playback
-#########################
-DestroyFunc Music-Next
+# mouse 2 Menu /Playback {{{2
AddToFunc Music-Next
+ I Exec exec mocp --sync --next
-DestroyFunc Music-Prev
AddToFunc Music-Prev
+ I Exec exec mocp --sync --previous
-DestroyFunc Music-Stop
AddToFunc Music-Stop
+ I Exec exec mocp --sync --stop
-DestroyFunc Music-Play
AddToFunc Music-Play
+ I Exec exec mocp --sync --play
-DestroyFunc Music-Pause
AddToFunc Music-Pause
+ I Exec exec mocp --sync --pause
-DestroyFunc Music-PlayPause
AddToFunc Music-PlayPause
+ I Exec exec mocp --sync --toggle-pause
-DestroyFunc Playback-generator
AddToFunc Playback-generator
+ I DestroyMenu recreate /Playback
+ I AddToMenu /Playback '$[gt.Next]' Music-Next
@@ -126,24 +90,39 @@
+ I AddToMenu /Playback '$[gt.Pause]' Music-Pause
+ I AddToMenu /Playback '$[gt.Play/Pause]' Music-PlayPause
-## 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
-########################
-# Main functions and menus
-DestroyMenu /Music
-AddToMenu /Music
-+ DynamicPopupAction Function Music-generator
-
-DestroyFunc Music-generator
+# Main functions and menus {{{1
AddToFunc Music-generator
+ I DestroyMenu recreate /Music
+ I AddToMenu /Music '$[gt.Load playlist]' Popup /Music/LoadPlaylist
+ I AddToMenu /Music '$[gt.Clear playlist]' Music-ClearPlaylist
+ I AddToMenu /Music '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
++ I AddToMenu /Playlist-button '$[gt.Playlist copy]' Popup /Music/CopyPlaylist
+ I AddToMenu /Music "" Nop
+ I AddToMenu /Music '$[gt.Stop playback]' Music-Stop
+ I AddToMenu /Music '$[gt.Play/Pause]' Music-PlayPause
++ I AddToMenu /Music "" Nop
++ I AddToMenu /Music '$[gt.Music player]' Popup /Preferences/MusicPlayer
+# Fake button functions {{{1
+# Menu /Music/Volume (TODO)
+AddToMenu /Music/Volume
++ "" Nop
+# 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.
|
|
From: <dom...@us...> - 2013-04-16 19:30:48
|
Revision: 244
http://sourceforge.net/p/fvwm-crystal/code/244
Author: dominique_libre
Date: 2013-04-16 19:30:43 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
New preferences Silent operations which redirect stdr to /dev/null
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Colorsets
fvwm/components/functions/Preferences
fvwm/components/functions/Preferences-Menu
fvwm/components/functions/Wallpaper
fvwm/components/functions/Window-Decorations
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-16 16:04:17 UTC (rev 243)
+++ ChangeLog 2013-04-16 19:30:43 UTC (rev 244)
@@ -1,5 +1,13 @@
ChangeLog for FVWM-Crystal
+Mardi 16 Avril 2013 Dominique Michel
+ funcctions/Preferences; functions/Preferences-Menu; functions/Wallpaper;
+ functions/Window-Decorations; functions/Colorsets: New Silent operation
+ preferences. If enabled, it will redirect stdr to /dev/null for
+ all applications launched via the functions in Exec-Accelerator.
+ As a side effect, SavePreferences support now space into the file names
+ for all the related preferences inclusive WallpaperSet.
+
Lundi 15 Avril 2013 Dominique Michel
+ Export.README: Free Export Regulations rules
Modified: fvwm/components/functions/Colorsets
===================================================================
--- fvwm/components/functions/Colorsets 2013-04-16 16:04:17 UTC (rev 243)
+++ fvwm/components/functions/Colorsets 2013-04-16 19:30:43 UTC (rev 244)
@@ -10,7 +10,7 @@
AddToFunc Colorsets-Set
+ I Read $*
+ I UpdateStyles
-+ I SavePreferences LastChoosenColorset "Colorsets-Set \"$*\""
++ I SavePreferences LastChoosenColorset "Colorsets-Set $*"
DestroyMenu /Colorsets
Modified: fvwm/components/functions/Preferences
===================================================================
--- fvwm/components/functions/Preferences 2013-04-16 16:04:17 UTC (rev 243)
+++ fvwm/components/functions/Preferences 2013-04-16 19:30:43 UTC (rev 244)
@@ -17,7 +17,7 @@
#
DestroyFunc SavePreferences
AddToFunc SavePreferences
-+ I Exec echo $1 > $[FVWM_USERDIR]/preferences/$0
++ I Exec echo "$1" > $[FVWM_USERDIR]/preferences/$0
# Modification of SavePreferences: add more lines to the preferences file
# Must be used in conjonction with Schedule or the synchronization will be lost
Modified: fvwm/components/functions/Preferences-Menu
===================================================================
--- fvwm/components/functions/Preferences-Menu 2013-04-16 16:04:17 UTC (rev 243)
+++ fvwm/components/functions/Preferences-Menu 2013-04-16 19:30:43 UTC (rev 244)
@@ -19,6 +19,7 @@
+ '$[gt.Privileged terminals]' Popup /Preferences/PrivilegedTerminals
+ "" Nop
+ '$[gt.Generate application menu]' GenerateApplicationMenu
++ '$[gt.Silent operations]' Popup /Preferences/SilentOps
#
# Used recipe
@@ -40,7 +41,7 @@
DestroyFunc Recipe-Set
AddToFunc Recipe-Set
+ I SetEnv Fvwm_Crystal_Recipe "$*"
-+ I SavePreferences LastChoosenRecipe "SetEnv Fvwm_Crystal_Recipe \"$*\""
++ I SavePreferences LastChoosenRecipe "SetEnv Fvwm_Crystal_Recipe $*"
+ I Module FvwmForm Recipe-Restart-Dialog
All (Recipe-Restart-Dialog) Close
@@ -475,5 +476,23 @@
+ I *Pref-Warning-Dialog: Line center
+ I Module FvwmForm Pref-Warning-Dialog
+#
+# Silent operations
+#
+DestroyMenu /Preferences/SilentOps
+AddToMenu /Preferences/SilentOps
++ '$[gt.On]' SetSilentOps
++ '$[gt.Off]' UnsetSilentOps
+
+DestroyFunc SetSilentOps
+AddToFunc SetSilentOps
++ I SavePreferences SilentOps "InfoStoreAdd SILENT \'2>/dev/null\'"
++ I Schedule 333 Include components/functions/Exec-Accelerator
+
+DestroyFunc UnsetSilentOps
+AddToFunc UnsetSilentOps
++ I SavePreferences SilentOps "InfoStoreAdd SILENT \' \'"
++ I Schedule 333 Include components/functions/Exec-Accelerator
+
# vim:ft=fvwm
Modified: fvwm/components/functions/Wallpaper
===================================================================
--- fvwm/components/functions/Wallpaper 2013-04-16 16:04:17 UTC (rev 243)
+++ fvwm/components/functions/Wallpaper 2013-04-16 19:30:43 UTC (rev 244)
@@ -7,7 +7,7 @@
+ I Test (x Esetroot) Exec Esetroot -scale $*
+ I TestRc (NoMatch) Test (x hsetroot) Exec hsetroot -fill $*
+ I TestRc (NoMatch) Test (x feh) Exec feh --bg-scale --no-fehbg $*
-+ I SavePreferences LastChoosenWallpaper "Wallpaper-Set \"$*\""
++ I SavePreferences LastChoosenWallpaper "Wallpaper-Set $*"
# Select random wallpaper from given directories and set it
DestroyFunc Wallpaper-Random
Modified: fvwm/components/functions/Window-Decorations
===================================================================
--- fvwm/components/functions/Window-Decorations 2013-04-16 16:04:17 UTC (rev 243)
+++ fvwm/components/functions/Window-Decorations 2013-04-16 19:30:43 UTC (rev 244)
@@ -12,11 +12,11 @@
AddToFunc Window-Decorations-Set
+ I Test (f '$0/$[Window_Decorations_ButtonModel]') Read '$0/$[Window_Decorations_ButtonModel]'
#+ I TestRc (Match) KeepRc Include components/styles/Window-Decorations
-+ I TestRc (Match) KeepRc SavePreferences LastChoosenWindowDecoration "Window-Decorations-Set \"$*\""
++ I TestRc (Match) KeepRc SavePreferences LastChoosenWindowDecoration "Window-Decorations-Set $*"
+ I TestRc (NoMatch) KeepRc FindFile Window_Decorations_ButtonModel-Temp '$0' Theme.nextstep Theme.os2 Theme.macosx Theme.windows Theme.amigaos Theme.fvwm-crystal
+ I TestRc (NoMatch) Test (f '$0/$[Window_Decorations_ButtonModel-Temp]') Read '$0/$[Window_Decorations_ButtonModel-Temp]'
#+ I TestRc (Match) KeepRc Include components/styles/Window-Decorations
-+ I TestRc (Match) KeepRc SavePreferences LastChoosenWindowDecoration "Window-Decorations-Set \"$*\""
++ I TestRc (Match) KeepRc SavePreferences LastChoosenWindowDecoration "Window-Decorations-Set $*"
+ I UnsetEnv Window_Decorations_ButtonModel-Temp
@@ -62,7 +62,7 @@
DestroyFunc Window-Decorations-SetButtonModel
AddToFunc Window-Decorations-SetButtonModel
+ I SetEnv Window_Decorations_ButtonModel "$*"
-+ I SavePreferences LastChoosenButtonModel "SetEnv Window_Decorations_ButtonModel \"$*\""
++ I SavePreferences LastChoosenButtonModel "SetEnv Window_Decorations_ButtonModel '$*'"
+ I LoadPreferences LastChoosenWindowDecoration
# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-17 20:22:50
|
Revision: 250
http://sourceforge.net/p/fvwm-crystal/code/250
Author: dominique_libre
Date: 2013-04-17 20:22:46 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
functions/Music: added missing functions from Music-mplayer. components/Music-mplayer: cleanup; added preliminary DVB support
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Music
fvwm/components/functions/Music-mplayer
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-17 18:35:42 UTC (rev 249)
+++ ChangeLog 2013-04-17 20:22:46 UTC (rev 250)
@@ -3,6 +3,9 @@
Mercredi 17 Avril Dominique Michel
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.
Mardi 16 Avril 2013 Dominique Michel
funcctions/Preferences; functions/Preferences-Menu; functions/Wallpaper;
Modified: fvwm/components/functions/Music
===================================================================
--- fvwm/components/functions/Music 2013-04-17 18:35:42 UTC (rev 249)
+++ fvwm/components/functions/Music 2013-04-17 20:22:46 UTC (rev 250)
@@ -246,6 +246,9 @@
DestroyFunc Music-VolumeEn
# audacious, mplayer
DestroyFunc Music-Volume
+# mplayer
+DestroyFunc Music-VolumeUp
+DestroyFunc Music-VolumeDown
# alsaplayer, mplayer
DestroyFunc Music-Speed
@@ -289,6 +292,11 @@
# button menu (alsaplayer, audacious, mocp, mpd, mplayer, xmms2)
DestroyFunc Playlist-generator-button
DestroyMenu /Playlist-button
+# mplayer
+DestroyMenu /Playlist
+DestroyMenu /Playlist-bot
+DestroyFunc /Playlist-generator
+DestroyFunc /Playlist-generator-bot
# Button 2 mouse 2 (alsaplayer, audacious, mplayer) {{{2
DestroyMenu /Music/Volume
@@ -312,6 +320,9 @@
# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms2
DestroyFunc Music-Pause
+# mplayer
+DestroyFunc Music-FrameStep
+
# Button 3 mouse 3 (all) {{{2
DestroyMenu /Playback
AddToMenu /Playback
Modified: fvwm/components/functions/Music-mplayer
===================================================================
--- fvwm/components/functions/Music-mplayer 2013-04-17 18:35:42 UTC (rev 249)
+++ fvwm/components/functions/Music-mplayer 2013-04-17 20:22:46 UTC (rev 250)
@@ -1,36 +1,31 @@
# Support for MPlayer media player into Fvwm-Crystal
# Written by: Dominique Michel <dom...@so...> 2008-2013
-# Load shared functions and initialisations {{{1
-Include components/functions/Media
-
# 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 InfoStoreAdd USERDIR `id -un`'
Test (!F /home/$[infostore.USERDIR]/.mplayer/pipe) PipeRead 'mkfifo /home/$[infostore.USERDIR]/.mplayer/pipe'
+# Load shared functions and initialisations {{{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 MPlayer]' Music-Start "mplayer -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 {{{2
-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/LoadMediaPlaylist
@@ -246,7 +223,6 @@
+ 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
@@ -257,17 +233,12 @@
+ 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
+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.
|
|
From: <dom...@us...> - 2013-04-17 21:05:23
|
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.
|
|
From: <dom...@us...> - 2013-04-17 22:16:20
|
Revision: 253
http://sourceforge.net/p/fvwm-crystal/code/253
Author: dominique_libre
Date: 2013-04-17 22:16:17 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
functions/Music-quodlibet: cleanup
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Music-quodlibet
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-17 21:11:39 UTC (rev 252)
+++ ChangeLog 2013-04-17 22:16:17 UTC (rev 253)
@@ -6,6 +6,7 @@
functions/Music-mpd: cleanup
functions/Music; functions/Media: added missing functions from Music-mplayer
functions/Music-mplayer*: cleanup; added preliminary DVB support.
+ functions/Music-quodlibet: cleanup
Mardi 16 Avril 2013 Dominique Michel
funcctions/Preferences; functions/Preferences-Menu; functions/Wallpaper;
Modified: fvwm/components/functions/Music-quodlibet
===================================================================
--- fvwm/components/functions/Music-quodlibet 2013-04-17 21:11:39 UTC (rev 252)
+++ fvwm/components/functions/Music-quodlibet 2013-04-17 22:16:17 UTC (rev 253)
@@ -1,27 +1,18 @@
# Support for QuodLibet music player
# Written by: Maciej Delmanowski <ha...@po...>
# sed commands by: Grzegorz Niew�owski <ho...@do...>
-# Modifications, debugging and improvments by Dominique Michel
-# <dom...@so...>
+# Modifications, debugging and improvments by Dominique Michel 2008-2013
+# <dom...@us...>
-# Overview:
-# This is a set of function for controlling the Music Player Daemon
-# (http://www.musicpd.org/). It is done using the 'mpc' command-line frontend.
-
# Initialisations, shared functions
Include components/functions/Music
-###################
-## First button ###
-## Player controls and prefs ##
-###############################
-## mouse 1 Menu /Player
-#######################
-DestroyFunc Music-GUI
+# First button {{{1
+# Player controls and prefs
+# mouse 1 Menu /Player {{{1
AddToFunc Music-GUI
+ I All (quodlibet) 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
@@ -33,49 +24,36 @@
+ I AddToMenu /Player '$[gt.Stop player]' Exec exec quodlibet --quit
+ I AddToMenu /Player '$[gt.Show/Hide player]' Music-GUI
-## mouse 2 Music-GUI : allready here
+# mouse 2 Music-GUI : allready here {{{2
## mouse 3 Music-QJackGUI : in Music
-##
-
-## mouse 2 Menu /Playback
-#########################
-DestroyFunc Music-Next
+# mouse 2 Menu /Playback {{{1
AddToFunc Music-Next
+ I Exec quodlibet --next > /dev/null
-DestroyFunc Music-Prev
AddToFunc Music-Prev
+ I Exec quodlibet --previous > /dev/null
-DestroyFunc Music-Stop
AddToFunc Music-Stop
+ I Exec quodlibet --pause > /dev/null
-DestroyFunc Music-Play
AddToFunc Music-Play
+ I Exec quodlibet --play > /dev/null
-DestroyFunc Music-Pause
AddToFunc Music-Pause
+ I Exec quodlibet --pause > /dev/null
-DestroyFunc Music-PlayPause
AddToFunc Music-PlayPause
+ I Exec quodlibet --play-pause > /dev/null
-DestroyFunc Music-Forward
AddToFunc Music-Forward
+ I Exec quodlibet --shuffle t > /dev/null; quodlibet --next > /dev/null; quodlibet --shuffle t > /dev/null
-DestroyFunc Music-Backward
AddToFunc Music-Backward
+ I Exec quodlibet --shuffle t > /dev/null; quodlibet --previous > /dev/null; quodlibet --shuffle t > /dev/null
-DestroyFunc Music-ToggleRandom
AddToFunc Music-ToggleRandom
+ I Exec quodlibet --shuffle t
-DestroyFunc Playback-generator
AddToFunc Playback-generator
+ I DestroyMenu recreate /Playback
+ I AddToMenu /Playback '$[gt.Next]' Music-Next
@@ -90,26 +68,42 @@
+ I AddToMenu /Playback '$[gt.Forward]' Music-Forward
+ I AddToMenu /Playback '$[gt.Backward]' Music-Backward
-## mouse 3 Menu /Mixer : in components/Mixer
+## mouse 3 Menu /Mixer : in components/Mixer {{{1
## mouse 4 Music-Next : allready here
## mouse 4 Music-Prev : allready here
-
-# ---------------------------------------------------------------------------
-# Main menu
-DestroyMenu /Music
-AddToMenu /Music
-+ DynamicPopupAction Function /Music-generator
-
-DestroyFunc /Music-generator
-AddToFunc /Music-generator
+# Main menu {{{1
+AddToFunc Music-generator
+ I DestroyMenu recreate /Music
+ I PipeRead 'quodlibet --print-playing | sed -e "s:^.*$:AddToMenu /Music \'&\' :"'
+ I AddToMenu /Music "" Nop
-+ I AddToMenu /Music '$[gt.Volume]' Popup /Mixer
-+ I AddToMenu /Music '$[gt.Toggle random]' Music-ToggleRandom
-+ I AddToMenu /Music '$[gt.Toggle repeat]' Exec quodlibet --repeat t
++ I AddToMenu /Music '$[gt.Volume]' Popup /Mixer
++ I AddToMenu /Music '$[gt.Toggle random]' Music-ToggleRandom
++ I AddToMenu /Music '$[gt.Toggle repeat]' Exec quodlibet --repeat t
+ I AddToMenu /Music "" Nop
+ I AddToMenu /Music '$[gt.Play/Pause]' Music-PlayPause
++ I AddToMenu /Music "" Nop
++ I AddToMenu /Music '$[gt.Music player]' Popup /Preferences/MusicPlayer
+# Fake button functions {{{1
+# /Playlist-button
+AddToMenu /Playlist-button
++ "" Nop
+# Menu /Music/Volume (TODO)
+AddToMenu /Music/Volume
++ "" Nop
+# 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.
|
|
From: <dom...@us...> - 2013-04-18 15:25:00
|
Revision: 254
http://sourceforge.net/p/fvwm-crystal/code/254
Author: dominique_libre
Date: 2013-04-18 15:24:56 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
Music-xmms2: cleanup; move to InfoStore; added player volume control; Music-GUI use now Iconify toggle (fix volume reset with jack output)
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Media
fvwm/components/functions/Music
fvwm/components/functions/Music-xmms2
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-17 22:16:17 UTC (rev 253)
+++ ChangeLog 2013-04-18 15:24:56 UTC (rev 254)
@@ -1,5 +1,11 @@
ChangeLog for FVWM-Crystal
+Jeudi 18 Avril Dominique Michel
+ functions/Music; Functions/Media; functions/Music-xmms: Cleanup; moved
+ to InfoStore; added player volume control; added missing menus;
+ Music-GUI now use Iconify toggle instead of Close (fix reset the volume
+ with the jack output)
+
Mercredi 17 Avril Dominique Michel
scripts/FvwmMPD/*: make the windows and fonts bigger. Its better to big
than too small
Modified: fvwm/components/functions/Media
===================================================================
--- fvwm/components/functions/Media 2013-04-17 22:16:17 UTC (rev 253)
+++ fvwm/components/functions/Media 2013-04-18 15:24:56 UTC (rev 254)
@@ -71,7 +71,7 @@
PipeRead 'if [[ $[MusicPlayer] == alsaplayer ]]; then echo "InfoStoreAdd dec_point `locale decimal_point`"; fi'
# xmms2
-UnSetEnv fvwm_audio_exec
+InfoStoreRemove fvwm_audio_exec
# Styles for media players windows {{{1
Style Alsaplayer NoActiveIconOverride, NoIcon, Sticky, WindowListSkip, StaysOnTop
@@ -235,6 +235,7 @@
# Add playlist (xmms2)
DestroyFunc FuncFvwmMenuPlaylistDirectory
DestroyMenu /Music/LoadPlaylist
+DestroyMenu /Music/AddPlaylist
# Update the database (mpd)
DestroyFunc Music-Update
Modified: fvwm/components/functions/Music
===================================================================
--- fvwm/components/functions/Music 2013-04-17 22:16:17 UTC (rev 253)
+++ fvwm/components/functions/Music 2013-04-18 15:24:56 UTC (rev 254)
@@ -74,7 +74,7 @@
PipeRead 'if [[ $[MusicPlayer] == alsaplayer ]]; then echo "InfoStoreAdd dec_point `locale decimal_point`"; fi'
# xmms2
-UnSetEnv fvwm_audio_exec
+InfoStoreRemove fvwm_audio_exec
# Styles for media players windows {{{1
Style Alsaplayer NoActiveIconOverride, NoIcon, Sticky, WindowListSkip, StaysOnTop
@@ -99,10 +99,7 @@
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 gxmms2 StaysOnTop, NoIcon, Sticky, WindowListSkip
Style qjackctl NoActiveIconOverride, NoIcon, Sticky, WindowListSkip
@@ -178,6 +175,7 @@
DestroyFunc FuncFvwmMenuAudioDirectory
# Add playlist (xmms2)
DestroyFunc FuncFvwmMenuPlaylistDirectory
+DestroyMenu /Music/AddPlaylist
# Load playlist (mpd, xmms2)
DestroyFunc Music-LoadPlaylist-generator
# Load playlist (alsaplayer, audacious, mocp, mpd, mplayer, xmms2)
Modified: fvwm/components/functions/Music-xmms2
===================================================================
--- fvwm/components/functions/Music-xmms2 2013-04-17 22:16:17 UTC (rev 253)
+++ fvwm/components/functions/Music-xmms2 2013-04-18 15:24:56 UTC (rev 254)
@@ -1,27 +1,21 @@
# Support for XMMS2
# Author: Michal Gorny <per...@ma...>
# Based on xmms2 command-line client, version 0.2 DrBombay
-# Modifications, debugging and improvments by Dominique Michel
-# <dom...@so...>
-######################################################
+# Modifications, debugging and improvments by Dominique Michel 2008-2013
+# <dom...@us...>
-# Initialisations, shared functions
+# Initialisations, shared functions {{{1
Include components/functions/Music
-SetEnv fvwm_audio_exec "nyxmms2 add -P"
+InfoStoreAdd fvwm_audio_exec "nyxmms2 add -P"
-###################
-## First button ###
-## Player controls and prefs ##
-###############################
-## mouse 1 Menu /Player
-#######################
-DestroyFunc Music-GUI
+# First button {{{1
+# Player controls and prefs
+# mouse 1 Menu /Player {{{2
AddToFunc Music-GUI
-+ I All (gxmms2) Close
++ I All (gxmms2) Iconify toggle
+ I TestRc (NoMatch) None (gxmms2) X gxmms2
# 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
@@ -32,35 +26,27 @@
+ I AddToMenu /Player '$[gt.Stop XMMS2]' Exec exec killall -9 xmms2d
+ I AddToMenu /Player '$[gt.Show/Hide GXMMS2]' Music-GUI
-####################
-## Second button ###
-## Player controls and main vol ##
-##################################
-## mouse 1 Menu /Playlist-button
-################################
-DestroyFunc Music-CurrentPlaylist-generator
+# Second button {{{1
+# Player controls and main vol
+# mouse 1 Menu /Playlist-button {{{2
AddToFunc Music-CurrentPlaylist-generator
+ I DestroyMenu recreate /Music/CurrentPlaylist
+ I PipeRead 'nyxmms2 list | head -n -2 | sed -e "s:^.*\\[\\(.*\\)/.*\\] \\(.*\\)$:AddToMenu /Music/CurrentPlaylist \\\'\\2\\\' Exec nyxmms2 jump \'\\1\':"'
-DestroyMenu /Music/CurrentPlaylist
AddToMenu /Music/CurrentPlaylist
+ DynamicPopupAction Function Music-CurrentPlaylist-generator
-DestroyFunc Music-LoadPlaylist-generator
AddToFunc Music-LoadPlaylist-generator
-+ I DestroyMenu recreate /Music/LoadPlaylist
-+ I AddToMenu /Music/LoadPlaylist '$[gt.Choose a playlist to load]' Nop
-+ I PipeRead 'nyxmms2 playlist list | sed -e "s:^\\( *\\)\\(.*\\):\\2:" | sed -e "s:^.*$:AddToMenu /Music/LoadPlaylist \'&\' Exec nyxmms2 playlist switch \'&\':"'
-+ I AddToMenu /Music/LoadPlaylist "" Nop
-+ I AddToMenu /Music/LoadPlaylist '$[gt.Everything]' Music-LoadAll
++ I DestroyMenu recreate /Music/AddPlaylist
++ I AddToMenu /Music/AddPlaylist '$[gt.Choose a playlist to load]' Nop
++ I PipeRead 'nyxmms2 playlist list | sed -e "s:^\\( *\\)\\(.*\\):\\2:" | sed -e "s:^.*$:AddToMenu /Music/AddPlaylist \'&\' Exec nyxmms2 playlist switch \'&\':"'
++ I AddToMenu /Music/AddPlaylist "" Nop
++ I AddToMenu /Music/AddPlaylist '$[gt.Everything]' Music-LoadAll
-DestroyMenu /Music/LoadPlaylist
-AddToMenu /Music/LoadPlaylist
+DestroyMenu /Music/AddPlaylist
+AddToMenu /Music/AddPlaylist
+ DynamicPopupAction Function Music-LoadPlaylist-generator
-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
@@ -73,11 +59,9 @@
*Music-SavePlaylist-Dialog: Command Exec nyxmms2 playlist create -p _active "$(PlaylistName)"
*Music-SavePlaylist-Dialog: Line center
-DestroyFunc Music-SavePlaylist
AddToFunc Music-SavePlaylist
+ I Module FvwmForm Music-SavePlaylist-Dialog
-DestroyFunc Music-ClearPlaylist
AddToFunc Music-ClearPlaylist
+ I Exec nyxmms2 playlist clear
@@ -87,78 +71,61 @@
+ I AddToMenu /Music/RemovePlaylist '$[gt.Choose a playlist to remove]' Nop
+ I PipeRead 'nyxmms2 playlist list | sed -e "s:^\\(* *\\)\\(.*\\):\\2:" | sed -e "s:^\\( *\\)\\(.*\\):\\2:" | sed -e "s:^.*$:AddToMenu /Music/RemovePlaylist \'&\' Exec nyxmms2 playlist remove \'&\':"'
-DestroyMenu /Music/RemovePlaylist
-AddToMenu /Music/RemovePlaylist
-+ DynamicPopupAction Function Music-RemovePlaylist-generator
-
# 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 FuncFvwmMenuPlaylistDirectory
-AddToFunc FuncFvwmMenuPlaylistDirectory
+
+# /Music/LoadPlaylist
+AddToFunc FuncFvwmMenuAudioDirectory
+ I PipeRead 'case "$0" in \
- "$[AudioPlaylists]"*) myexec="$[fvwm_audio_exec]";; \
- "$[UserManagedAudioPlaylists]"*) myexec="$[fvwm_audio_exec]";; \
+ "$[infostore.AudioPlaylists]"*) myexec="$[infostore.fvwm_audio_exec]";; \
+ "$[infostore.UserManagedAudioPlaylists]"*) myexec="$[infostore.fvwm_audio_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}" \
- --exec-file "^${myexec}" --dir "$0" --exec-t="-" \
- --func="FuncFvwmMenuPlaylistDirectory"'
-# put one popup line per path :
-DestroyMenu /Music/AddPlaylist
-AddToMenu /Music/AddPlaylist MissingSubmenuFunction FuncFvwmMenuPlaylistDirectory
-+ '%22x22/categories/video_movies_view.png%$[gt.Audio playlists]' Popup $[AudioPlaylists]
-+ '%22x22/categories/video_movies_view.png%$[gt.Personal audio playlists]' Popup $[UserManagedAudioPlaylists]
+ fvwm-menu-directory --icon-title "${mytitle:-22x22/categories/directory.png}" \
+ --icon-file "${mypng:-22x22/categories/Audio.png}" \
+ --dir "$0" --exec-title "-" --exec-file "^${myexec}" \
+ --func-name "FuncFvwmMenuAudioDirectory"'
-DestroyFunc Music-RemoveSong
AddToFunc Music-RemoveSong
+ I Exec nyxmms2 next
+ I Exec nyxmms2 remove $((`nyxmms2 list | sed -e "s;^->\[;;" | sed -e "s;/.*;;" | sed -e "s; .*;;" | sed -e "s;To.*;;"`-1))
-DestroyFunc Playlist-generator-button
AddToFunc Playlist-generator-button
+ I DestroyMenu recreate /Playlist-button
+ I AddToMenu /Playlist-button '$[gt.Current playlist]' Popup /Music/CurrentPlaylist
-+ I AddToMenu /Playlist-button '$[gt.Load playlist]' Popup /Music/LoadPlaylist
-+ I AddToMenu /Playlist-button '$[gt.Save playlist]' Music-SavePlaylist
-+ I AddToMenu /Playlist-button '$[gt.Clear playlist]' Music-ClearPlaylist
-+ I AddToMenu /Playlist-button '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
++ I AddToMenu /Playlist-button '$[gt.Load playlist]' Popup /Music/LoadPlaylist
++ I AddToMenu /Playlist-button '$[gt.Add playlist]' Popup /Music/AddPlaylist
++ I AddToMenu /Playlist-button '$[gt.Save playlist]' Music-SavePlaylist
++ I AddToMenu /Playlist-button '$[gt.Clear playlist]' Music-ClearPlaylist
++ I AddToMenu /Playlist-button '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
+ I AddToMenu /Playlist-button "" Mop
-+ I AddToMenu /Playlist-button '$[gt.Add a playlist]' Popup /Music/AddPlaylist
++ I AddToMenu /Playlist-button '$[gt.Add a playlist]' Popup /Music/AddPlaylist
+ I AddToMenu /Playlist-button '$[gt.Remove current song]' Music-RemoveSong
-DestroyMenu /Playlist-button
AddToMenu /Playlist-button
+ DynamicPopupAction Function Playlist-generator-button
-## mouse 2 Menu /Playback
-#########################
-DestroyFunc Music-Next
+# mouse 2 Menu /Playback {{{1
AddToFunc Music-Next
+ I Exec nyxmms2 next
-DestroyFunc Music-Prev
AddToFunc Music-Prev
+ I Exec nyxmms2 prev
-DestroyFunc Music-Stop
AddToFunc Music-Stop
+ I Exec nyxmms2 stop
-DestroyFunc Music-Play
AddToFunc Music-Play
+ I Exec nyxmms2 play
-DestroyFunc Music-Pause
AddToFunc Music-Pause
+ I Exec nyxmms2 pause
-DestroyFunc Music-Shuffle
AddToFunc Music-Shuffle
+ I Exec nyxmms2 playlist shuffle
-DestroyFunc Playback-generator
AddToFunc Playback-generator
+ I DestroyMenu recreate /Playback
+ I AddToMenu /Playback '$[gt.Next]' Music-Next
@@ -170,31 +137,57 @@
+ I AddToMenu /Playback "" Nop
+ I AddToMenu /Playback '$[gt.Shuffle playlist]' Music-Shuffle
-###########################
-DestroyMenu /Music
-AddToMenu /Music
-+ DynamicPopupAction Function /Music-generator
+# values determined with a 0dB 1kHz wave tone on the jack output
+# tested with the alsa output
+AddToMenu /Music/Volume
++ '$[gt.Player volume]' Nop
++ "" Nop
++ " 0 dB" Exec nyxmms2 server volume 100
++ "-3 dB" Exec nyxmms2 server volume 84
++ "-6 dB" Exec nyxmms2 server volume 71
++ "-12 dB" Exec nyxmms2 server volume 50
++ "-18 dB" Exec nyxmms2 server volume 35
++ "-24 dB" Exec nyxmms2 server volume 25
++ "-30 dB" Exec nyxmms2 server volume 18
++ "-36 dB" Exec nyxmms2 server volume 12
++ " 0" Exec nyxmms2 server volume 0
-DestroyFunc /Music-generator
-AddToFunc /Music-generator
+# menus {{{1
+AddToFunc Music-generator
+ I DestroyMenu recreate /Music
+ I PipeRead 'xmms2 current | sed -e "s:^ERROR.*$:$[gt.Player is stopped]:" | sed -e "s:^.*$:AddToMenu /Music \'\&\':"'
+ I AddToMenu /Music "" Nop
#+ I AddToMenu /Music '$[gt.Current playlist]' Popup /Music/CurrentPlaylist
+ I AddToMenu /Music '$[gt.Load playlist]' Popup /Music/LoadPlaylist
++ I AddToMenu /Music '$[gt.Add playlist]' Popup /Music/AddPlaylist
+ I AddToMenu /Music '$[gt.Save playlist...]' Music-SavePlaylist
+ I AddToMenu /Music '$[gt.Shuffle playlist]' Music-Shuffle
+ I AddToMenu /Music '$[gt.Clear playlist]' Music-ClearPlaylist
+ I AddToMenu /Music '$[gt.Remove current song]' Music-RemoveSong
+ I AddToMenu /Music '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
-
+ I AddToMenu /Music "" Nop
-#+ I PipeRead 'xmms2 configlist | grep output\.volume | sed -e "s;output.volume = ;;" | sed -e "s;^.*$;AddToMenu /Music \'$[gt.Volume]: \&\' Popup /Mixer:;"'
++ I PipeRead 'xmms2 server config | sed -n "/\\.volume/{s/.*= \\([0-9]\\+\\)$/AddToMenu \\/Music \'$[gt.Volume]: \\1\' Popup \\/Music\\/volume/p;q}"'
+ 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]' Music-Play
+ I AddToMenu /Music '$[gt.Pause]' Music-Pause
++ I AddToMenu /Music "" Nop
++ I AddToMenu /Music '$[gt.Music player]' Popup /Preferences/MusicPlayer
+# 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.
|
|
From: <dom...@us...> - 2013-04-18 16:04:53
|
Revision: 255
http://sourceforge.net/p/fvwm-crystal/code/255
Author: dominique_libre
Date: 2013-04-18 16:04:48 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
Removing of Music-xmms
Modified Paths:
--------------
ChangeLog
Removed Paths:
-------------
fvwm/components/functions/Music-xmms
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-18 15:24:56 UTC (rev 254)
+++ ChangeLog 2013-04-18 16:04:48 UTC (rev 255)
@@ -5,6 +5,7 @@
to InfoStore; added player volume control; added missing menus;
Music-GUI now use Iconify toggle instead of Close (fix reset the volume
with the jack output)
+- components/functions/xmms: removing of outdated player
Mercredi 17 Avril Dominique Michel
scripts/FvwmMPD/*: make the windows and fonts bigger. Its better to big
Deleted: fvwm/components/functions/Music-xmms
===================================================================
--- fvwm/components/functions/Music-xmms 2013-04-18 15:24:56 UTC (rev 254)
+++ fvwm/components/functions/Music-xmms 2013-04-18 16:04:48 UTC (rev 255)
@@ -1,200 +0,0 @@
-# Support for XMMS music player into FVWM-Crystal
-# Written by: Maciej Delmanowski <ha...@po...>
-# Modifications, debugging and improvments by Dominique Michel
-# <dom...@so...>
-#############################################################################
-# Warning ; I cannot test it anymore because xmms, even if it compile fine, #
-# just doesn't run into my system. #
-# If no one is reproting than 1) he/she tested succefully this control and #
-# 2) he/she need this control, #
-# this will be removed without merci from the next release #
-#############################################################################
-
-# Initialisations, shared functions
-Include components/functions/Music
-
-###################
-## First button ###
-## Player controls and prefs ##
-###############################
-## mouse 1 Menu /Player
-#######################
-DestroyFunc Music-GUI
-AddToFunc Music-GUI
-+ I All (XMMS_Player) 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
-+ I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Music player]' Popup /Preferences/MusicPlayer
-+ I AddToMenu /Player "" Nop
-+ I AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl
-+ I AddToMenu /Player "" Nop
-+ I AddToMenu /Player '$[gt.Start player]' Exec exec xmms
-+ I AddToMenu /Player '$[gt.Stop player]' Exec exec killall -9 xmms
-+ I AddToMenu /Player '$[gt.Show/Hide player]' Music-GUI
-
-####################
-## Second button ###
-## Player controls and main vol ##
-##################################
-## mouse 1 Menu /Playlist-button
-################################
-DestroyFunc Music-LoadPlaylist-generator
-AddToFunc Music-LoadPlaylist-generator
-+ I DestroyMenu recreate /Music/LoadPlaylist
-+ I AddToMenu /Music/LoadPlaylist
-+ I PipeRead 'for i in $[AudioPlaylists]/*.{m3u,pls}; do \
- name=$(basename "$i"); \
- sname=${name%%.m3u}; \
- sname=${sname%%.pls}; \
- echo \"AddToMenu /Music/LoadPlaylist \'$sname\' Exec exec xmms -e \'$i\'\"; done'
-
-DestroyMenu /Music/LoadPlaylist
-AddToMenu /Music/LoadPlaylist
-+ DynamicPopupAction Function Music-LoadPlaylist-generator
-
-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
-*Music-SavePlaylist-Dialog: Input PlaylistName 40 ""
-*Music-SavePlaylist-Dialog: Line center
-*Music-SavePlaylist-Dialog: Line center
-*Music-SavePlaylist-Dialog: Button quit " $[gt.Cancel] " ^[
-*Music-SavePlaylist-Dialog: Command Nop
-*Music-SavePlaylist-Dialog: Button quit " $[gt.Save] " ^M
-*Music-SavePlaylist-Dialog: Command Exec exec xmms-shell -e "save '$[XMMS_Playlists]/$(PlaylistName).m3u'"
-*Music-SavePlaylist-Dialog: Line center
-
-DestroyFunc Music-SavePlaylist
-AddToFunc Music-SavePlaylist
-+ I Exec exec mkdir -p $[XMMS_Playlists]
-+ I Module FvwmForm Music-SavePlaylist-Dialog
-
-DestroyFunc Music-ClearPlaylist
-AddToFunc Music-ClearPlaylist
-+ I Exec exec xmms-shell -e "clear"
-
-DestroyFunc Music-RemoveSong
-AddToFunc Music-RemoveSong
-+ I Exec exec xmms-shell -e "remove `xmms-shell -e currenttrack | sed -e 's/Current song: //' -e 's/\..*//'`"
-
-DestroyFunc Music-RemovePlaylist-generator
-AddToFunc Music-RemovePlaylist-generator
-+ I DestroyMenu recreate /Music/RemovePlaylist
-+ I AddToMenu /Music/RemovePlaylist
-+ I PipeRead 'for i in $[AudioPlaylists]/*.{m3u,pls}; do \
- name=$(basename "$i"); \
- sname=${name%%.m3u}; \
- sname=${sname%%.pls}; \
- echo \"AddToMenu /Music/RemovePlaylist \'$sname\' Exec rm -f \'$i\'\"; done'
-
-DestroyMenu /Music/RemovePlaylist
-AddToMenu /Music/RemovePlaylist
-+ DynamicPopupAction Function Music-RemovePlaylist-generator
-
-DestroyFunc Playlist-generator-button
-AddToFunc Playlist-generator-button
-+ I DestroyMenu recreate /Playlist-button
-+ I AddToMenu /Playlist-button '$[gt.Load playlist]' Popup /Music/LoadPlaylist
-+ I AddToMenu /Playlist-button '$[gt.Save playlist]' Music-SavePlaylist
-+ I AddToMenu /Playlist-button '$[gt.Clear playlist]' Music-ClearPlaylist
-+ I AddToMenu /Playlist-button '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
-+ I AddToMenu /Playlist-button '$[gt.Remove current song]' Music-RemoveSong
-
-DestroyMenu /Playlist-button
-AddToMenu /Playlist-button
-+ DynamicPopupAction Function Playlist-generator-button
-
-## mouse 2 Menu /Playback
-#########################
-DestroyFunc Music-Next
-AddToFunc Music-Next
-+ I Exec exec xmms --fwd
-
-DestroyFunc Music-Prev
-AddToFunc Music-Prev
-+ I Exec exec xmms --rew
-
-DestroyFunc Music-Stop
-AddToFunc Music-Stop
-+ I Exec exec xmms --stop
-
-DestroyFunc Music-Play
-AddToFunc Music-Play
-+ I Exec exec xmms --play
-
-DestroyFunc Music-Pause
-AddToFunc Music-Pause
-+ I Exec exec xmms --pause
-
-DestroyFunc Music-PlayPause
-AddToFunc Music-PlayPause
-+ I Exec exec xmms --play-pause
-
-DestroyFunc Music-Forward
-AddToFunc Music-Forward
-+ I Exec exec xmms-shell -e "forward"
-
-DestroyFunc Music-Backward
-AddToFunc Music-Backward
-+ I Exec exec xmms-shell -e "backward"
-
-DestroyFunc Music-ToggleRandom
-AddToFunc Music-ToggleRandom
-+ I Exec exec xmms-shell -e "shuffle toggle"
-
-DestroyFunc Music-Find
-AddToFunc Music-Find
-+ I Style XmmsFind* NoTitle
-+ I Style XmmsFind* StaysOnTop
-+ I Style XmmsFind* Sticky
-+ I Style XmmsFind* StartNormal
-+ I Exec pidof xmms && exec xmmsfind_remote
-+ I TestRc (Match) Wait XmmsFind*
-+ I All (XmmsFind*, CurrentPage) Focus
-
-DestroyFunc Playback-generator
-AddToFunc Playback-generator
-+ I DestroyMenu recreate /Playback
-+ I AddToMenu /Playback '$[gt.Next]' Music-Next
-+ I AddToMenu /Playback '$[gt.Prev]' Music-Prev
-+ I AddToMenu /Playback "" Nop
-+ I AddToMenu /Playback '$[gt.Stop playback]' Music-Stop
-+ I AddToMenu /Playback '$[gt.Play]' Music-Play
-+ I AddToMenu /Playback '$[gt.Pause]' Music-Pause
-+ I AddToMenu /Playback '$[gt.Play/Pause]' Music-PlayPause
-+ I AddToMenu /Playback "" Nop
-+ I AddToMenu /Playback $[gt.Forward]' Music-Forward
-+ I AddToMenu /Playback $[gt.Backward]' Music-Backward
-+ I AddToMenu /Playback $[gt.Toggle random]' Music-ToggleRandom
-+ I AddToMenu /Playback $[gt.Music find]' Music-Find
-
-##########################
-# Main functions and menus
-DestroyMenu /Music
-AddToMenu /Music
-+ DynamicPopupAction Function /Music-generator
-
-DestroyFunc /Music-generator
-AddToFunc /Music-generator
-+ I DestroyMenu recreate /Music
-+ I AddToMenu /Music '$[gt.Load playlist]' Popup /Music/LoadPlaylist
-+ I AddToMenu /Music '$[gt.Save playlist...]' Music-SavePlaylist
-+ I AddToMenu /Music '$[gt.Clear playlist]' Music-ClearPlaylist
-+ I AddToMenu /Music '$[gt.Remove current song]' Music-RemoveSong
-+ I AddToMenu /Music '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
-+ I AddToMenu /Music "" Nop
-+ I PipeRead 'xmms-shell -e "volume" | head -1 | sed -e "s/Left channel volume:\ //" | sed -e "s:[ \t]::g" | sed -e "s:^.\\+$:AddToMenu\ /Music \'$[gt.Volume] \(&%%\)\' Popup /Mixer:"'
-
-+ I AddToMenu /Music '$[gt.Toggle random]' Music-ToggleRandom
-+ I AddToMenu /Music '$[gt.Toggle repeat]' Exec exec xmms-shell -e "repeat toggle"
-+ 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
-
-# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-18 20:30:02
|
Revision: 256
http://sourceforge.net/p/fvwm-crystal/code/256
Author: dominique_libre
Date: 2013-04-18 20:29:57 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
Moved all the shared functions from mplayer* to media; fix freeze when changing from one dvb adapter to another one; added channel netx-prev for dvb
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Media
fvwm/components/functions/Music
fvwm/components/functions/Music-mplayer
fvwm/components/functions/Music-mplayer2
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-18 16:04:48 UTC (rev 255)
+++ ChangeLog 2013-04-18 20:29:57 UTC (rev 256)
@@ -6,7 +6,11 @@
Music-GUI now use Iconify toggle instead of Close (fix reset the volume
with the jack output)
- components/functions/xmms: removing of outdated player
-
+ functions/Music: added missing functions from mplayer control
+ functions/Media; functions/Music-mplayer; functions/Music-mplayer2: moved
+ all the shared functions and menus to Media; added channel next and
+ prev for DVB; fix freeze when changing from one DVB adapter to another one.
+
Mercredi 17 Avril Dominique Michel
scripts/FvwmMPD/*: make the windows and fonts bigger. Its better to big
than too small
Modified: fvwm/components/functions/Media
===================================================================
--- fvwm/components/functions/Media 2013-04-18 16:04:48 UTC (rev 255)
+++ fvwm/components/functions/Media 2013-04-18 20:29:57 UTC (rev 256)
@@ -64,12 +64,17 @@
InfoStoreAdd UserManagedVideoPlaylists "$[HOME]/Playlists/Video"
# speed control (alsaplayer, mplayer) {{{2
-# (TODO: 1 variable per player)
+# (TODO: 1 variable per player ?)
InfoStoreAdd speed 1
-# Decimal point in use {{{2
-PipeRead 'if [[ $[MusicPlayer] == alsaplayer ]]; then echo "InfoStoreAdd dec_point `locale decimal_point`"; fi'
+# Decimal point in use (alsaplayer) {{{2
+PipeRead 'if [[ $[MusicPlayer] == alsaplayer ]]; then echo "InfoStoreAdd dec_point `locale decimal_point`"; else echo "InfoStoreRemove dec_point"; fi'
+# We must start mplayer 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'
+
# xmms2
InfoStoreRemove fvwm_audio_exec
@@ -121,18 +126,37 @@
# start the player(s) (alsaplayer, mplayer)
DestroyFunc Music-Start
+AddToFunc Music-Start
++ I Exec exec $0
+
+# in Music-mplayer*
DestroyMenu /Music/Start
# player quit (alsaplayer, mplayer)
DestroyFunc Music-Kill
+AddToFunc Music-Kill
++ I Exec exec echo "quit" > /home/$[infostore.USERDIR]/.mplayer/pipe
# show/hyde the player GUI/menu
# (alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet)
DestroyFunc Music-GUI
+AddToFunc Music-GUI
++ I All (XDRadio) Iconify toggle
# Button menu
# (alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet)
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
++ I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Music player]' Popup /Preferences/MusicPlayer
++ I AddToMenu /Player "" Nop
++ I AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl
++ I AddToMenu /Player "" Nop
++ I AddToMenu /Player '$[gt.Start player]' Popup /Music/Start
++ I AddToMenu /Player '$[gt.Stop MPlayer]' Music-Kill
++ I AddToMenu /Player '$[gt.Show/Hide menu]' Music-GUI
+
# Button menu (all)
DestroyMenu /Player
AddToMenu /Player
@@ -157,7 +181,14 @@
# Play DVD (mplayer)
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://
+# Generate /Music/LoadMovie menu (mplayer)
+PipeRead '$[FVWM_SYSTEMDIR]/scripts/media_directories $[infostore.USERDIR]'
+Include tmp/MenuMovieDirectory
+
# Show current playlist (xmms2)
DestroyFunc Music-CurrentPlaylist-generator
DestroyMenu /Music/CurrentPlaylist
@@ -267,10 +298,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@
+Test (F /dev/dvb/adapter0/frontend0) + I AddToMenu /Playlist-button '$[gt.Watch DVB] 1' Music-WatchDVB 1
+Test (F /dev/dvb/adapter1/frontend0) + I AddToMenu /Playlist-button '$[gt.Watch DVB] 2' Music-WatchDVB 2
+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.Watch DVB] 4' Music-WatchDVB 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
@@ -281,16 +312,61 @@
# mplayer
DestroyMenu /Playlist
+AddToMenu /Playlist
++ DynamicPopupAction Function /Playlist-generator
+
DestroyMenu /Playlist-bot
+AddToMenu /Playlist-bot
++ DynamicPopupAction Function /Playlist-generator-bot
+
DestroyFunc /Playlist-generator
+AddToFunc /Playlist-generator
++ I DestroyMenu recreate /Playlist
+Test (F /dev/dvb/adapter0/frontend0) + I AddToMenu /Playlist '$[gt.Watch DVB] 1' Music-WatchDVB 1
+Test (F /dev/dvb/adapter1/frontend0) + I AddToMenu /Playlist '$[gt.Watch DVB] 2' Music-WatchDVB 2
+Test (F /dev/dvb/adapter2/frontend0) + I AddToMenu /Playlist '$[gt.Watch DVB] 3' Music-WatchDVB 3
+Test (F /dev/dvb/adapter3/frontend0) + I AddToMenu /Playlist '$[gt.Watch DVB] 4' Music-WatchDVB 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/LoadMediaPlaylist
+#+ I AddToMenu /Playlist '$[gt.Clear playlist]' Music-ClearPlaylist
++ 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 Music-WatchDVB
+AddToFunc Music-WatchDVB
++ I Exec exec echo "stop" > /home/$[infostore.USERDIR]/.mplayer/pipe
++ I Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvb://$[0]@
++ I Exec exec echo "start" > /home/$[infostore.USERDIR]/.mplayer/pipe
+
# mouse 2 Menu /Playback {{{2
# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms2
DestroyFunc Music-Next
+AddToFunc Music-Next
++ I Exec exec echo "pt_step 1" > /home/$[infostore.USERDIR]/.mplayer/pipe
+# dvb:
++ I Exec exec echo "tv_step_channel +1" > /home/$[infostore.USERDIR]/.mplayer/pipe
# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms2
DestroyFunc Music-Prev
+AddToFunc Music-Prev
++ I Exec exec echo "pt_step -1" > /home/$[infostore.USERDIR]/.mplayer/pipe
+# dvb:
++ I Exec exec echo "tv_step_channel -1" > /home/$[infostore.USERDIR]/.mplayer/pipe
# alsaplayer
DestroyFunc Music-SongChange
@@ -301,12 +377,18 @@
# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms2
DestroyFunc Music-Play
+AddToFunc Music-Play
++ I Exec exec echo "frame_step" > /home/$[infostore.USERDIR]/.mplayer/pipe
# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms2
DestroyFunc Music-Pause
+AddToFunc Music-Pause
++ I Exec exec echo "pause" > /home/$[infostore.USERDIR]/.mplayer/pipe
# mplayer
DestroyFunc Music-FrameStep
+AddToFunc Music-FrameStep
++ I Exec exec echo "frame_step" > /home/$[infostore.USERDIR]/.mplayer/pipe
# alsaplayer, audacious, cdcd, cmus, mocp, mpd, quodlibet
DestroyFunc Music-PlayPause
@@ -322,11 +404,49 @@
# alsaplayer, mplayer
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'
++ " 60 %" Music-Jump '60'
++ " 40 %" Music-Jump '40'
++ " 20 %" Music-Jump '20'
++ " 10 %" Music-Jump '10'
++ " 5 %" Music-Jump '5'
++ " 2 %" Music-Jump '2'
++ " 1 %" Music-Jump '1'
++ '$[gt.Start]' Music-Jump '0'
# alsaplayer, mplayer
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'
++ '$[gt.+ 3 min]' Music-Seek '180'
++ '$[gt.+ 2 min]' Music-Seek '120'
++ '$[gt.+ 1 min 30]' Music-Seek '90'
++ '$[gt.+ 1 min]' Music-Seek '60'
++ '$[gt.+ 45 sec]' Music-Seek '45'
++ '$[gt.+ 30 sec]' Music-Seek '30'
++ '$[gt.+ 20 sec]' Music-Seek '20'
++ '$[gt.+ 10 sec]' Music-Seek '10'
++ '$[gt.- 10 sec]' Music-Seek '-10'
++ '$[gt.- 20 sec]' Music-Seek '-20'
++ '$[gt.- 30 sec]' Music-Seek '-30'
++ '$[gt.- 45 sec]' Music-Seek '-45'
++ '$[gt.- 1 min]' Music-Seek '-60'
++ '$[gt.- 1 min 30]' Music-Seek '-90'
++ '$[gt.- 2 min]' Music-Seek '-120'
++ '$[gt.- 3 min]' Music-Seek '-180'
++ '$[gt.- 5 min]' Music-Seek '-300'
++ '$[gt.- 10 min]' Music-Seek '-600'
# mpd
DestroyMenu /Music/Crossfade
@@ -337,6 +457,16 @@
# button menu
# (alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, mocp, mpd, mplayer, quodlibet, xmms2)
DestroyFunc Playback-generator
+AddToFunc Playback-generator
++ I DestroyMenu recreate /Playback
++ I AddToMenu /Playback '$[gt.Pause]' Music-Pause
++ I AddToMenu /Playback '$[gt.Frame step]' Music-FrameStep
++ I AddToMenu /Playback "" Nop
++ I AddToMenu /Playback '$[gt.Next]' Music-Next
++ I AddToMenu /Playback '$[gt.Prev]' Music-Prev
++ I AddToMenu /Playback '$[gt.Jump]' Popup /Music/Jump
++ I AddToMenu /Playback '$[gt.Seek]' Popup /Music/Seek
+
# button menu (all)
DestroyMenu /Playback
AddToMenu /Playback
@@ -356,26 +486,83 @@
DestroyFunc Music-VolumeEn
# audacious, mplayer
DestroyFunc Music-Volume
+AddToFunc Music-Volume
++ I Exec exec echo "volume $0 1" > /home/$[infostore.USERDIR]/.mplayer/pipe
+
# mplayer
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
# button menu (alsaplayer, audacious, mplayer)
DestroyMenu /Music/Volume
+AddToMenu /Music/Volume
++ '$[gt.MPlayer volume]' Nop
++ " 0 db" Music-Volume "100"
++ "- 3 db" Music-Volume "70.7"
++ "- 6 db" Music-Volume "50"
++ "- 12 dB" Music-Volume "25"
++ "- 18 db" Music-Volume "12.5"
++ "- 24 db" Music-Volume "6.25"
++ "- 30 db" Music-Volume "3.125"
++ "- 36 db" Music-Volume "1.5625"
++ " 0" Music-Volume "0"
# mouse 4 Music-Speed-Up {{{2
# mouse 5 Music-Speed-Down
# alsaplayer, mplayer
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])'
+
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
# alsaplayer, mplayer
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])"'
+
# button menu (alsaplayer, mplayer)
+# speed_set <0.01 to 100>
DestroyMenu /Speed
+AddToMenu /Speed
++ '$[gt.Speed control]' Nop
++ "" Nop
++ '$[gt.Max]' Music-Speed 'maxmplayer mplayer'
++ '$[gt.+ 2 octaves]' Music-Speed '+2octave mplayer'
++ '$[gt.+ 1 octave]' Music-Speed '+1octave mplayer'
++ '$[gt.+ 1 seventh]' Music-Speed '+1septieme mplayer'
++ '$[gt.+ 1 sixth]' Music-Speed '+1sixte mplayer'
++ '$[gt.+ 1 fifth]' Music-Speed '+1quinte mplayer'
++ '$[gt.+ 1 fourth]' Music-Speed '+1quarte mplayer'
++ '$[gt.+ 1 third]' Music-Speed '+1tierce mplayer'
++ '$[gt.+ 1 tone]' Music-Speed '+1ton mplayer'
++ '$[gt.+ 1/2 tone]' Music-Speed '+1/2ton mplayer'
++ "" Nop
++ '$[gt.- 1/2 tone]' Music-Speed '-1/2ton mplayer'
++ '$[gt.- 1 tone]' Music-Speed '-1ton mplayer'
++ '$[gt.- 1 third]' Music-Speed '-1tierce mplayer'
++ '$[gt.- 1 fourth]' Music-Speed '-1quarte mplayer'
++ '$[gt.- 1 fifth]' Music-Speed '-1quinte mplayer'
++ '$[gt.- 1 sixth]' Music-Speed '-1sixte mplayer'
++ '$[gt.- 1 seventh]' Music-Speed '-1septieme mplayer'
++ '$[gt.- 1 octave]' Music-Speed '-1octave mplayer'
++ '$[gt.- 2 octaves]' Music-Speed '-2octave mplayer'
++ '$[gt.Min]' Music-Speed 'minmplayer mplayer'
++ "" Nop
++ '$[gt.Normal]' Music-Speed 'normal mplayer'
++ '$[gt.+ 1 comma]' Music-Speed '+1comma mplayer'
++ '$[gt.Pause]' Music-Pause
++ '$[gt.- 1 comma]' Music-Speed '-1comma mplayer'
# mouse 4 Button-Seek-+ {{{2
# mouse 5 Button-Seek--
@@ -386,6 +573,15 @@
# Music menus {{{1
# main music menu (alsaplayer, audacious, mocp) {{{2
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.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
DestroyMenu /Music
AddToMenu /Music
Modified: fvwm/components/functions/Music
===================================================================
--- fvwm/components/functions/Music 2013-04-18 16:04:48 UTC (rev 255)
+++ fvwm/components/functions/Music 2013-04-18 20:29:57 UTC (rev 256)
@@ -295,6 +295,7 @@
DestroyMenu /Playlist-bot
DestroyFunc /Playlist-generator
DestroyFunc /Playlist-generator-bot
+DestroyFunc Music-WatchDVB
# Button 2 mouse 2 (alsaplayer, audacious, mplayer) {{{2
DestroyMenu /Music/Volume
Modified: fvwm/components/functions/Music-mplayer
===================================================================
--- fvwm/components/functions/Music-mplayer 2013-04-18 16:04:48 UTC (rev 255)
+++ fvwm/components/functions/Music-mplayer 2013-04-18 20:29:57 UTC (rev 256)
@@ -1,250 +1,12 @@
# Support for MPlayer media player into Fvwm-Crystal
# 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
-# 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'
-
-# Load shared functions and initialisations {{{1
+# Load shared functions and initialisations
Include components/functions/Media
-# First button {{{1
-# Player controls and prefs
-# mouse 1 Menu /Player {{{2
-AddToFunc Music-Start
-+ I Exec exec $0
-
+# specific function
AddToMenu /Music/Start
+ '$[gt.Start MPlayer]' Music-Start "mplayer -ao jack, -fs -fixed-vo -slave -idle -capture -input file=/home/$[infostore.USERDIR]/.mplayer/pipe"
Test (x xdradio) + '$[gt.Start XDRadio]' Music-Start "xdradio"
-AddToFunc Music-Kill
-+ I Exec exec echo "quit" > /home/$[infostore.USERDIR]/.mplayer/pipe
-
-AddToFunc Music-GUI
-+ I All (XDRadio) Iconify toggle
-
-AddToFunc Player-generator
-+ I DestroyMenu recreate /Player
-+ I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Recreate the Playlists]' Music-RecreatePlaylist
-+ I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Music player]' Popup /Preferences/MusicPlayer
-+ I AddToMenu /Player "" Nop
-+ I AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl
-+ I AddToMenu /Player "" Nop
-+ I AddToMenu /Player '$[gt.Start player]' Popup /Music/Start
-+ I AddToMenu /Player '$[gt.Stop MPlayer]' Music-Kill
-+ I AddToMenu /Player '$[gt.Show/Hide menu]' Music-GUI
-
-# 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 {{{1
-# Player controls and main vol
-# mouse 1 Menu /Playlist-button {{{2
-AddToFunc Load-DVD
-#+ I Exec exec fvwm-crystal.mplayer-wrapper dvd $[infostore.USERDIR]
-+ I Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvdnav://
-
-# Generate /Music/LoadMovie menu (mplayer)
-PipeRead '$[FVWM_SYSTEMDIR]/scripts/media_directories $[infostore.USERDIR]'
-Include tmp/MenuMovieDirectory
-
-# mouse 2 Menu /Playback {{{2
-AddToFunc Music-Pause
-+ I Exec exec echo "pause" > /home/$[infostore.USERDIR]/.mplayer/pipe
-
-AddToFunc Music-FrameStep
-+ I Exec exec echo "frame_step" > /home/$[infostore.USERDIR]/.mplayer/pipe
-
-AddToFunc Music-Next
-+ I Exec exec echo "pt_step 1" > /home/$[infostore.USERDIR]/.mplayer/pipe
-
-AddToFunc Music-Prev
-+ I Exec exec echo "pt_step -1" > /home/$[infostore.USERDIR]/.mplayer/pipe
-
-AddToFunc Music-Jump
-+ I Exec exec echo "seek $0 1" > /home/$[infostore.USERDIR]/.mplayer/pipe
-
-AddToMenu /Music/Jump
-+ " 96 %" Music-Jump '96'
-+ " 80 %" Music-Jump '80'
-+ " 60 %" Music-Jump '60'
-+ " 40 %" Music-Jump '40'
-+ " 20 %" Music-Jump '20'
-+ " 10 %" Music-Jump '10'
-+ " 5 %" Music-Jump '5'
-+ " 2 %" Music-Jump '2'
-+ " 1 %" Music-Jump '1'
-+ '$[gt.Start]' Music-Jump '0'
-
-AddToFunc Music-Seek
-+ I Exec exec echo "seek $0 0" > /home/$[infostore.USERDIR]/.mplayer/pipe
-
-AddToMenu /Music/Seek
-+ '$[gt.+ 10 min]' Music-Seek '600'
-+ '$[gt.+ 5 min]' Music-Seek '300'
-+ '$[gt.+ 3 min]' Music-Seek '180'
-+ '$[gt.+ 2 min]' Music-Seek '120'
-+ '$[gt.+ 1 min 30]' Music-Seek '90'
-+ '$[gt.+ 1 min]' Music-Seek '60'
-+ '$[gt.+ 45 sec]' Music-Seek '45'
-+ '$[gt.+ 30 sec]' Music-Seek '30'
-+ '$[gt.+ 20 sec]' Music-Seek '20'
-+ '$[gt.+ 10 sec]' Music-Seek '10'
-+ '$[gt.- 10 sec]' Music-Seek '-10'
-+ '$[gt.- 20 sec]' Music-Seek '-20'
-+ '$[gt.- 30 sec]' Music-Seek '-30'
-+ '$[gt.- 45 sec]' Music-Seek '-45'
-+ '$[gt.- 1 min]' Music-Seek '-60'
-+ '$[gt.- 1 min 30]' Music-Seek '-90'
-+ '$[gt.- 2 min]' Music-Seek '-120'
-+ '$[gt.- 3 min]' Music-Seek '-180'
-+ '$[gt.- 5 min]' Music-Seek '-300'
-+ '$[gt.- 10 min]' Music-Seek '-600'
-
-AddToFunc Playback-generator
-+ I DestroyMenu recreate /Playback
-+ I AddToMenu /Playback '$[gt.Pause]' Music-Pause
-+ I AddToMenu /Playback '$[gt.Frame step]' Music-FrameStep
-+ I AddToMenu /Playback "" Nop
-+ I AddToMenu /Playback '$[gt.Next]' Music-Next
-+ I AddToMenu /Playback '$[gt.Prev]' Music-Prev
-+ I AddToMenu /Playback '$[gt.Jump]' Popup /Music/Jump
-+ I AddToMenu /Playback '$[gt.Seek]' Popup /Music/Seek
-
-# 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 {{{2
-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
-AddToFunc Music-Volume
-+ I Exec exec echo "volume $0 1" > /home/$[infostore.USERDIR]/.mplayer/pipe
-
-AddToMenu /Music/Volume
-+ '$[gt.MPlayer volume]' Nop
-+ " 0 db" Music-Volume "100"
-+ "- 3 db" Music-Volume "70.7"
-+ "- 6 db" Music-Volume "50"
-+ "- 12 dB" Music-Volume "25"
-+ "- 18 db" Music-Volume "12.5"
-+ "- 24 db" Music-Volume "6.25"
-+ "- 30 db" Music-Volume "3.125"
-+ "- 36 db" Music-Volume "1.5625"
-+ " 0" Music-Volume "0"
-
-# mouse 4 Music-Speed-Up {{{2
-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
-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
-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>
-AddToMenu /Speed
-+ '$[gt.Speed control]' Nop
-+ "" Nop
-+ '$[gt.Max]' Music-Speed 'maxmplayer mplayer'
-+ '$[gt.+ 2 octaves]' Music-Speed '+2octave mplayer'
-+ '$[gt.+ 1 octave]' Music-Speed '+1octave mplayer'
-+ '$[gt.+ 1 seventh]' Music-Speed '+1septieme mplayer'
-+ '$[gt.+ 1 sixth]' Music-Speed '+1sixte mplayer'
-+ '$[gt.+ 1 fifth]' Music-Speed '+1quinte mplayer'
-+ '$[gt.+ 1 fourth]' Music-Speed '+1quarte mplayer'
-+ '$[gt.+ 1 third]' Music-Speed '+1tierce mplayer'
-+ '$[gt.+ 1 tone]' Music-Speed '+1ton mplayer'
-+ '$[gt.+ 1/2 tone]' Music-Speed '+1/2ton mplayer'
-+ "" Nop
-+ '$[gt.- 1/2 tone]' Music-Speed '-1/2ton mplayer'
-+ '$[gt.- 1 tone]' Music-Speed '-1ton mplayer'
-+ '$[gt.- 1 third]' Music-Speed '-1tierce mplayer'
-+ '$[gt.- 1 fourth]' Music-Speed '-1quarte mplayer'
-+ '$[gt.- 1 fifth]' Music-Speed '-1quinte mplayer'
-+ '$[gt.- 1 sixth]' Music-Speed '-1sixte mplayer'
-+ '$[gt.- 1 seventh]' Music-Speed '-1septieme mplayer'
-+ '$[gt.- 1 octave]' Music-Speed '-1octave mplayer'
-+ '$[gt.- 2 octaves]' Music-Speed '-2octave mplayer'
-+ '$[gt.Min]' Music-Speed 'minmplayer mplayer'
-+ "" Nop
-+ '$[gt.Normal]' Music-Speed 'normal mplayer'
-+ '$[gt.+ 1 comma]' Music-Speed '+1comma mplayer'
-+ '$[gt.Pause]' Music-Pause
-+ '$[gt.- 1 comma]' Music-Speed '-1comma mplayer'
-
-# mouse 4 Button-Seek-+ {{{2
-# mouse 5 Button-Seek--
-
-# Basic control functions {{{1
-
-AddToFunc Music-VolumeUp
-+ I Exec exec echo "volume 10 0" > /home/$[infostore.USERDIR]/.mplayer/pipe
-
-AddToFunc Music-VolumeDown
-+ I Exec exec echo "volume -10 0" > /home/$[infostore.USERDIR]/.mplayer/pipe
-
-# Playlist functions and menus {{{1
-
-AddToMenu /Playlist
-+ DynamicPopupAction Function /Playlist-generator
-
-AddToMenu /Playlist-bot
-+ DynamicPopupAction Function /Playlist-generator-bot
-
-# Main functions and menus {{{1
-
-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/LoadMediaPlaylist
-#+ I AddToMenu /Playlist '$[gt.Clear playlist]' Music-ClearPlaylist
-+ I AddToMenu /Playlist '$[gt.Copy playlist]' Popup /Music/CopyPlaylist
-+ I AddToMenu /Playlist '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
-
-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' 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:
-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.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
-
# vim:ft=fvwm
Modified: fvwm/components/functions/Music-mplayer2
===================================================================
--- fvwm/components/functions/Music-mplayer2 2013-04-18 16:04:48 UTC (rev 255)
+++ fvwm/components/functions/Music-mplayer2 2013-04-18 20:29:57 UTC (rev 256)
@@ -1,250 +1,12 @@
# Support for MPlayer2 media player into Fvwm-Crystal
# Written by: Dominique Michel <dom...@us...> 2009-2013
-# 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
+# Initialisations, shared functions
Include components/functions/Media
-# First button [[[1
-# Player controls and prefs
-# mouse 1 Menu /Player {{{2
-AddToFunc Music-Start
-+ I Exec exec $0
-
+# specific function
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"
-AddToFunc Music-Kill
-+ I Exec exec echo "quit" > /home/$[infostore.USERDIR]/.mplayer/pipe
-
-AddToFunc Music-GUI
-+ I All (XDRadio) Iconify toggle
-
-AddToFunc Player-generator
-+ I DestroyMenu recreate /Player
-+ I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Recreate the Playlists]' Music-RecreatePlaylist
-+ I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Music player]' Popup /Preferences/MusicPlayer
-+ I AddToMenu /Player "" Nop
-+ I AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl
-+ I AddToMenu /Player "" Nop
-+ I AddToMenu /Player '$[gt.Start player]' Popup /Music/Start
-+ I AddToMenu /Player '$[gt.Stop MPlayer2]' Music-Kill
-+ I AddToMenu /Player '$[gt.Show/Hide menu]' Music-GUI
-
-# 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 {{{1
-# Player controls and main vol
-# mouse 1 Menu /Playlist-button {{{2
-AddToFunc Load-DVD
-#+ I Exec exec fvwm-crystal.mplayer-wrapper dvd $[infostore.USERDIR]
-+ I Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvdnav://
-
-# Generate /Music/LoadMovie menu (mplayer)
-PipeRead '$[FVWM_SYSTEMDIR]/scripts/media_directories $[infostore.USERDIR]'
-Include tmp/MenuMovieDirectory
-
-# mouse 2 Menu /Playback {{{1
-AddToFunc Music-Pause
-+ I Exec exec echo "pause" > /home/$[infostore.USERDIR]/.mplayer/pipe
-
-AddToFunc Music-FrameStep
-+ I Exec exec echo "frame_step" > /home/$[infostore.USERDIR]/.mplayer/pipe
-
-AddToFunc Music-Next
-+ I Exec exec echo "pt_step 1" > /home/$[infostore.USERDIR]/.mplayer/pipe
-
-AddToFunc Music-Prev
-+ I Exec exec echo "pt_step -1" > /home/$[infostore.USERDIR]/.mplayer/pipe
-
-AddToFunc Music-Jump
-+ I Exec exec echo "seek $0 1" > /home/$[infostore.USERDIR]/.mplayer/pipe
-
-AddToMenu /Music/Jump
-+ " 96 %" Music-Jump '96'
-+ " 80 %" Music-Jump '80'
-+ " 60 %" Music-Jump '60'
-+ " 40 %" Music-Jump '40'
-+ " 20 %" Music-Jump '20'
-+ " 10 %" Music-Jump '10'
-+ " 5 %" Music-Jump '5'
-+ " 2 %" Music-Jump '2'
-+ " 1 %" Music-Jump '1'
-+ '$[gt.Start]' Music-Jump '0'
-
-AddToFunc Music-Seek
-+ I Exec exec echo "seek $0 0" > /home/$[infostore.USERDIR]/.mplayer/pipe
-
-AddToMenu /Music/Seek
-+ '$[gt.+ 10 min]' Music-Seek '600'
-+ '$[gt.+ 5 min]' Music-Seek '300'
-+ '$[gt.+ 3 min]' Music-Seek '180'
-+ '$[gt.+ 2 min]' Music-Seek '120'
-+ '$[gt.+ 1 min 30]' Music-Seek '90'
-+ '$[gt.+ 1 min]' Music-Seek '60'
-+ '$[gt.+ 45 sec]' Music-Seek '45'
-+ '$[gt.+ 30 sec]' Music-Seek '30'
-+ '$[gt.+ 20 sec]' Music-Seek '20'
-+ '$[gt.+ 10 sec]' Music-Seek '10'
-+ '$[gt.- 10 sec]' Music-Seek '-10'
-+ '$[gt.- 20 sec]' Music-Seek '-20'
-+ '$[gt.- 30 sec]' Music-Seek '-30'
-+ '$[gt.- 45 sec]' Music-Seek '-45'
-+ '$[gt.- 1 min]' Music-Seek '-60'
-+ '$[gt.- 1 min 30]' Music-Seek '-90'
-+ '$[gt.- 2 min]' Music-Seek '-120'
-+ '$[gt.- 3 min]' Music-Seek '-180'
-+ '$[gt.- 5 min]' Music-Seek '-300'
-+ '$[gt.- 10 min]' Music-Seek '-600'
-
-AddToFunc Playback-generator
-+ I DestroyMenu recreate /Playback
-+ I AddToMenu /Playback '$[gt.Pause]' Music-Pause
-+ I AddToMenu /Playback '$[gt.Frame step]' Music-FrameStep
-+ I AddToMenu /Playback "" Nop
-+ I AddToMenu /Playback '$[gt.Next]' Music-Next
-+ I AddToMenu /Playback '$[gt.Prev]' Music-Prev
-+ I AddToMenu /Playback '$[gt.Jump]' Popup /Music/Jump
-+ I AddToMenu /Playback '$[gt.Seek]' Popup /Music/Seek
-
-# 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 {{{2
-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
-AddToFunc Music-Volume
-+ I Exec exec echo "volume $0 1" > /home/$[infostore.USERDIR]/.mplayer/pipe
-
-AddToMenu /Music/Volume
-+ '$[gt.MPlayer volume]' Nop
-+ " 0 db" Music-Volume "100"
-+ "- 3 db" Music-Volume "70.7"
-+ "- 6 db" Music-Volume "50"
-+ "- 12 dB" Music-Volume "25"
-+ "- 18 db" Music-Volume "12.5"
-+ "- 24 db" Music-Volume "6.25"
-+ "- 30 db" Music-Volume "3.125"
-+ "- 36 db" Music-Volume "1.5625"
-+ " 0" Music-Volume "0"
-
-# mouse 4 Music-Speed-Up {{{2
-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
-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
-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>
-AddToMenu /Speed
-+ '$[gt.Speed control]' Nop
-+ "" Nop
-+ '$[gt.Max]' Music-Speed 'maxmplayer mplayer'
-+ '$[gt.+ 2 octaves]' Music-Speed '+2octave mplayer'
-+ '$[gt.+ 1 octave]' Music-Speed '+1octave mplayer'
-+ '$[gt.+ 1 seventh]' Music-Speed '+1septieme mplayer'
-+ '$[gt.+ 1 sixth]' Music-Speed '+1sixte mplayer'
-+ '$[gt.+ 1 fifth]' Music-Speed '+1quinte mplayer'
-+ '$[gt.+ 1 fourth]' Music-Speed '+1quarte mplayer'
-+ '$[gt.+ 1 third]' Music-Speed '+1tierce mplayer'
-+ '$[gt.+ 1 tone]' Music-Speed '+1ton mplayer'
-+ '$[gt.+ 1/2 tone]' Music-Speed '+1/2ton mplayer'
-+ "" Nop
-+ '$[gt.- 1/2 tone]' Music-Speed '-1/2ton mplayer'
-+ '$[gt.- 1 tone]' Music-Speed '-1ton mplayer'
-+ '$[gt.- 1 third]' Music-Speed '-1tierce mplayer'
-+ '$[gt.- 1 fourth]' Music-Speed '-1quarte mplayer'
-+ '$[gt.- 1 fifth]' Music-Speed '-1quinte mplayer'
-+ '$[gt.- 1 sixth]' Music-Speed '-1sixte mplayer'
-+ '$[gt.- 1 seventh]' Music-Speed '-1septieme mplayer'
-+ '$[gt.- 1 octave]' Music-Speed '-1octave mplayer'
-+ '$[gt.- 2 octaves]' Music-Speed '-2octave mplayer'
-+ '$[gt.Min]' Music-Speed 'minmplayer mplayer'
-+ "" Nop
-+ '$[gt.Normal]' Music-Speed 'normal mplayer'
-+ '$[gt.+ 1 comma]' Music-Speed '+1comma mplayer'
-+ '$[gt.Pause]' Music-Pause
-+ '$[gt.- 1 comma]' Music-Speed '-1comma mplayer'
-
-# mouse 4 Button-Seek-+ {{{2
-# mouse 5 Button-Seek--
-
-# Basic control functions {{{1
-
-AddToFunc Music-VolumeUp
-+ I Exec exec echo "volume 10 0" > /home/$[infostore.USERDIR]/.mplayer/pipe
-
-AddToFunc Music-VolumeDown
-+ I Exec exec echo "volume -10 0" > /home/$[infostore.USERDIR]/.mplayer/pipe
-
-# Playlist functions and menus {{{1
-
-AddToMenu /Playlist
-+ DynamicPopupAction Function /Playlist-generator
-
-AddToMenu /Playlist-bot
-+ DynamicPopupAction Function /Playlist-generator-bot
-
-# Main functions and menus {{{1
-
-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
-#+ I AddToMenu /Playlist '$[gt.Clear playlist]' Music-ClearPlaylist
-+ I AddToMenu /Playlist '$[gt.Copy playlist]' Popup /Music/CopyPlaylist
-+ I AddToMenu /Playlist '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
-
-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:
-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.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
-
# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X