Menu
▾
▴
[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[221] fvwm/components/functions
|
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.
|
