[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[511]

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

Revision: 511
          http://sourceforge.net/p/fvwm-crystal/code/511
Author:   dominique_libre
Date:     2013-06-18 20:46:38 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
functions/Mixer: fix for possible cursor freeze with mplayer; add Mixer-Mute-Toggle which only toggle mute alsamixer or aumix. bindings/KeyboardBinding: Mixer-Mute-Toggle with Ctrl + XF86AudioMute. asciidoc/KeyboardBindings: add above bindings. functions/About: updated version to 3.2.2. NEWS: version 3.2.2

Modified Paths:
--------------
    ChangeLog
    NEWS
    asciidoc/KeyboardBindings
    doc/html/KeyboardBindings.html
    fvwm/components/bindings/Multimedia_Keys
    fvwm/components/bindings/Multimedia_Keys_NumLock
    fvwm/components/functions/About
    fvwm/components/functions/Mixer
    man/ApplicationDatabase.1
    man/CrystalRoxHOWTO.1
    man/FVWMCrystalFAQ.1
    man/KeyboardBindings.1
    man/MouseBindings.1
    man/Tips.1
    man/fvwm-crystal.1

Modified: ChangeLog
===================================================================
--- ChangeLog	2013-06-15 18:00:02 UTC (rev 510)
+++ ChangeLog	2013-06-18 20:46:38 UTC (rev 511)
@@ -1,5 +1,13 @@
 ChangeLog for FVWM-Crystal
 
+Mardi 18 Juin 2013 Dominique Michel
+  functions/Mixer: fix for possible cursor freeze with mplayer;
+  add Mixer-Mute-Toggle which only toggle mute alsamixer or aumix.
+  vindings/KeyboardBinding: Mixer-Mute-Toggle with Ctrl + XF86AudioMute.
+  asciidoc/KeyboardBindings: add above bindings.
+  functions/About: updated version to 3.2.2
+  NEWS: version 3.2.2
+
 Samedi 15 Juin 2013 Dominique Michel
   functions/About: updated version to 3.2.1
   asciidoc/KeyboardBindings: fixed typo

Modified: NEWS
===================================================================
--- NEWS	2013-06-15 18:00:02 UTC (rev 510)
+++ NEWS	2013-06-18 20:46:38 UTC (rev 511)
@@ -1,3 +1,15 @@
+Version 3.2.2
+-------------
+
+This is a bug fix release that address a possible cursor freeze
+whit the toggle mute and/or pause function.
+
+A new toggle mute only function was added as well
+with the Ctrl + XF86AudioMute key binding.
+
+See ChangeLog for details.
+
+
 Version 3.2.1
 -------------
 

Modified: asciidoc/KeyboardBindings
===================================================================
--- asciidoc/KeyboardBindings	2013-06-15 18:00:02 UTC (rev 510)
+++ asciidoc/KeyboardBindings	2013-06-18 20:46:38 UTC (rev 511)
@@ -2,7 +2,7 @@
 ===================
 :doctype: manpage
 :man source:   KeyboardBindings
-:man version:  3.2.1
+:man version:  3.2.2
 :man manual:   FVWM-Crystal
 
 NAME
@@ -194,6 +194,9 @@
 	Toggle mute. When alsamixer or aumix is selected in the mixer preferences, the Master control, with fallback to PCM, will be (un)muted, and the prefered media player will be (un)paused.
 	When another mixer is selected, only the prefered media player will be (un)paused.
 
+*Ctrl + XF86AudioMute*::
+	Toggle mute only alsamixer or aumix.
+
 *XF86AudioPlay*::
 	Player frame step. Advance one frame or resume the pause.
 

Modified: doc/html/KeyboardBindings.html
===================================================================
--- doc/html/KeyboardBindings.html	2013-06-15 18:00:02 UTC (rev 510)
+++ doc/html/KeyboardBindings.html	2013-06-18 20:46:38 UTC (rev 511)
@@ -1142,6 +1142,14 @@
 </p>
 </dd>
 <dt class="hdlist1">
+<strong>Ctrl + XF86AudioMute</strong>
+</dt>
+<dd>
+<p>
+        Toggle mute only alsamixer or aumix.
+</p>
+</dd>
+<dt class="hdlist1">
 <strong>XF86AudioPlay</strong>
 </dt>
 <dd>
@@ -1453,7 +1461,7 @@
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2013-06-15 19:57:50 CEST
+Last updated 2013-06-18 22:46:12 CEST
 </div>
 </div>
 </body>

Modified: fvwm/components/bindings/Multimedia_Keys
===================================================================
--- fvwm/components/bindings/Multimedia_Keys	2013-06-15 18:00:02 UTC (rev 510)
+++ fvwm/components/bindings/Multimedia_Keys	2013-06-18 20:46:38 UTC (rev 511)
@@ -10,7 +10,7 @@
 Key XF86AudioLowerVolume A C Music-Speed-Down
 Key XF86AudioRaiseVolume A C Music-Speed-Up
 Key XF86AudioMute A $[Mod0] Mixer-Volume-Toggle
-key XF86AudioMute A C Mixer-Volume-Toggle
+key XF86AudioMute A C Mixer-Mute-Toggle
 key XF86AudioPlay A $[Mod0] Music-FrameStep
 #key XF86AudioPlay A $[Mod0] Music-PlayPause
 key XF86AudioPlay A $[Mod1] Music-Speed normal mplayer

Modified: fvwm/components/bindings/Multimedia_Keys_NumLock
===================================================================
--- fvwm/components/bindings/Multimedia_Keys_NumLock	2013-06-15 18:00:02 UTC (rev 510)
+++ fvwm/components/bindings/Multimedia_Keys_NumLock	2013-06-18 20:46:38 UTC (rev 511)
@@ -10,7 +10,7 @@
 Key XF86AudioLowerVolume A C2 Music-Speed-Down
 Key XF86AudioRaiseVolume A C2 Music-Speed-Up
 Key XF86AudioMute A $[Mod0]2 Mixer-Volume-Toggle
-key XF86AudioMute A C2 Music-Volume-Toggle
+key XF86AudioMute A C2 Mixer-Mute-Toggle
 key XF86AudioPlay A $[Mod0]2 Music-FrameStep
 key XF86AudioPlay A $[Mod1]2 Music-Speed normal mplayer
 key XF86AudioPlay A C2 Music-Pause

Modified: fvwm/components/functions/About
===================================================================
--- fvwm/components/functions/About	2013-06-15 18:00:02 UTC (rev 510)
+++ fvwm/components/functions/About	2013-06-18 20:46:38 UTC (rev 511)
@@ -5,7 +5,7 @@
 *About: Line center
 *About: Text "FVWM-Crystal"
 *About: Line center
-*About: Text "$[gt.Version]: 3.2.1"
+*About: Text "$[gt.Version]: 3.2.2"
 *About: Line center
 *About: Line center
 *About: Text "$[gt.Authors]: Maciej Delmanowski <ha...@gn...>"

Modified: fvwm/components/functions/Mixer
===================================================================
--- fvwm/components/functions/Mixer	2013-06-15 18:00:02 UTC (rev 510)
+++ fvwm/components/functions/Mixer	2013-06-18 20:46:38 UTC (rev 511)
@@ -141,10 +141,20 @@
 + I PipeRead 'if [[ $[infostore.MusicPlayer] ==  mocp ]]; then \\
 	exec mocp --sync --toggle-pause; fi'
 + I PipeRead 'if [[ $[infostore.MusicPlayer] ==  mplayer ]]; then \\
-	if [[ $[infostore.MixerMuteMP] == 0 ]]; then echo "InfoStoreAdd MixerMuteMP 1";	exec echo "pause" > /home/$[infostore.USERDIR]/.mplayer/pipe; else echo "InfoStoreAdd MixerMuteMP 0"; exec echo "pause" > /home/$[infostore.USERDIR]/.mplayer/pipe; fi; fi'
+	if [[ $[infostore.MixerMuteMP] == 0 ]]; then echo "InfoStoreAdd MixerMuteMP 1";	echo "Exec exec echo pause > /home/$[infostore.USERDIR]/.mplayer/pipe"; else echo "InfoStoreAdd MixerMuteMP 0"; echo "Exec exec echo pause > /home/$[infostore.USERDIR]/.mplayer/pipe"; fi; fi'
 + I PipeRead 'if [[ $[infostore.MusicPlayer] ==  mplayer2 ]]; then \\
-	if [[ $[infostore.MixerMuteMP2] == 0 ]]; then echo "InfoStoreAdd MixerMuteMP2 1";	exec echo "pause" > /home/$[infostore.USERDIR]/.mplayer/pipe; else echo "InfoStoreAdd MixerMuteMP2 0"; exec echo "pause" > /home/$[infostore.USERDIR]/.mplayer/pipe; fi; fi'
+	if [[ $[infostore.MixerMuteMP2] == 0 ]]; then echo "InfoStoreAdd MixerMuteMP2 1"; echo "Exec exec echo pause > /home/$[infostore.USERDIR]/.mplayer/pipe"; else echo "InfoStoreAdd MixerMuteMP2 0"; echo "Exec exec echo pause > /home/$[infostore.USERDIR]/.mplayer/pipe"; fi; fi'
 
+# Mixer volume mute toggle mute {{{2
+# Toggle only alsamixer or aumix if selected. 
+DestroyFunc Mixer-Mute-Toggle
+AddToFunc Mixer-Mute-Toggle
++ I PipeRead 'if [[ $[infostore.Mixer] == amixer ]]; then \\
+	if [[ $[infostore.MixerMute] == 0 ]]; then tmpval=`amixer -c $[infostore.SoundCard] get $[infostore.VolControl]`; tmpval2=`echo $tmpval|sed -e "s:\\(.*\\)\\(\\[.*dB]\\):\\2:" -e "s:\\[::" -e "s:\\]::"`; echo "InfoStoreAdd CurrentVolume $tmpval2"; amixer -c $[infostore.SoundCard] -- set $[infostore.VolControl] 0 > /dev/null; echo "InfoStoreAdd MixerMute 1"; else amixer -c $[infostore.Soundcard] -- set $[infostore.VolControl] $[infostore.CurrentVolume] > /dev/null; echo "InfoStoreAdd MixerMute 0"; fi; fi'
++ I PipeRead 'if [[ $[infostore.Mixer] == aumix ]]; then \\
+	if [[ $[infostore.MixerMute] == 0 ]]; then echo "InfoStoreAdd MixerMute 1"; tmpval=`aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]'q | sed -e "s:.*, ::"`; echo "InfoStoreAdd CurrentVolume $tmpval"; exec aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]' 0 > /dev/null; else echo "InfoStoreAdd MixerMute 0"; exec aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]' $[infostore.CurrentVolume] > /dev/null; fi; fi'
++
+
 # Mixer-Volume-dB <value>dB {{{2
 DestroyFunc Mixer-Volume-dB
 AddToFunc Mixer-Volume-dB

Modified: man/ApplicationDatabase.1
===================================================================
--- man/ApplicationDatabase.1	2013-06-15 18:00:02 UTC (rev 510)
+++ man/ApplicationDatabase.1	2013-06-18 20:46:38 UTC (rev 511)
@@ -2,12 +2,12 @@
 .\"     Title: ApplicationDatabase
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.0 <http://docbook.sf.net/>
-.\"      Date: 06/15/2013
+.\"      Date: 06/18/2013
 .\"    Manual: FVWM-Crystal
 .\"    Source: ApplicationDatabase 3.2.1
 .\"  Language: English
 .\"
-.TH "APPLICATIONDATABASE" "1" "06/15/2013" "ApplicationDatabase 3\&.2\&.1" "FVWM\-Crystal"
+.TH "APPLICATIONDATABASE" "1" "06/18/2013" "ApplicationDatabase 3\&.2\&.1" "FVWM\-Crystal"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

Modified: man/CrystalRoxHOWTO.1
===================================================================
--- man/CrystalRoxHOWTO.1	2013-06-15 18:00:02 UTC (rev 510)
+++ man/CrystalRoxHOWTO.1	2013-06-18 20:46:38 UTC (rev 511)
@@ -2,12 +2,12 @@
 .\"     Title: CrystalRoxHOWTO
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.0 <http://docbook.sf.net/>
-.\"      Date: 06/15/2013
+.\"      Date: 06/18/2013
 .\"    Manual: FVWM-Crystal
 .\"    Source: CrystalROXHOWTO 3.2.1
 .\"  Language: English
 .\"
-.TH "CRYSTALROXHOWTO" "1" "06/15/2013" "CrystalROXHOWTO 3\&.2\&.1" "FVWM\-Crystal"
+.TH "CRYSTALROXHOWTO" "1" "06/18/2013" "CrystalROXHOWTO 3\&.2\&.1" "FVWM\-Crystal"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

Modified: man/FVWMCrystalFAQ.1
===================================================================
--- man/FVWMCrystalFAQ.1	2013-06-15 18:00:02 UTC (rev 510)
+++ man/FVWMCrystalFAQ.1	2013-06-18 20:46:38 UTC (rev 511)
@@ -2,12 +2,12 @@
 .\"     Title: fvwm-crystal-FAQ
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.0 <http://docbook.sf.net/>
-.\"      Date: 06/15/2013
+.\"      Date: 06/18/2013
 .\"    Manual: FVWM-Crystal
 .\"    Source: FAQ 3.2.1
 .\"  Language: English
 .\"
-.TH "FVWM\-CRYSTAL\-FAQ" "1" "06/15/2013" "FAQ 3\&.2\&.1" "FVWM\-Crystal"
+.TH "FVWM\-CRYSTAL\-FAQ" "1" "06/18/2013" "FAQ 3\&.2\&.1" "FVWM\-Crystal"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

Modified: man/KeyboardBindings.1
===================================================================
--- man/KeyboardBindings.1	2013-06-15 18:00:02 UTC (rev 510)
+++ man/KeyboardBindings.1	2013-06-18 20:46:38 UTC (rev 511)
@@ -2,12 +2,12 @@
 .\"     Title: KeyboardBindings
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.0 <http://docbook.sf.net/>
-.\"      Date: 06/15/2013
+.\"      Date: 06/18/2013
 .\"    Manual: FVWM-Crystal
-.\"    Source: KeyboardBindings 3.2.1
+.\"    Source: KeyboardBindings 3.2.2
 .\"  Language: English
 .\"
-.TH "KEYBOARDBINDINGS" "1" "06/15/2013" "KeyboardBindings 3\&.2\&.1" "FVWM\-Crystal"
+.TH "KEYBOARDBINDINGS" "1" "06/18/2013" "KeyboardBindings 3\&.2\&.2" "FVWM\-Crystal"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -244,6 +244,11 @@
 Toggle mute\&. When alsamixer or aumix is selected in the mixer preferences, the Master control, with fallback to PCM, will be (un)muted, and the prefered media player will be (un)paused\&. When another mixer is selected, only the prefered media player will be (un)paused\&.
 .RE
 .PP
+\fBCtrl + XF86AudioMute\fR
+.RS 4
+Toggle mute only alsamixer or aumix\&.
+.RE
+.PP
 \fBXF86AudioPlay\fR
 .RS 4
 Player frame step\&. Advance one frame or resume the pause\&.

Modified: man/MouseBindings.1
===================================================================
--- man/MouseBindings.1	2013-06-15 18:00:02 UTC (rev 510)
+++ man/MouseBindings.1	2013-06-18 20:46:38 UTC (rev 511)
@@ -2,12 +2,12 @@
 .\"     Title: MouseBindings
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.0 <http://docbook.sf.net/>
-.\"      Date: 06/15/2013
+.\"      Date: 06/18/2013
 .\"    Manual: FVWM-Crystal
 .\"    Source: MouseBindings 3.2.1
 .\"  Language: English
 .\"
-.TH "MOUSEBINDINGS" "1" "06/15/2013" "MouseBindings 3\&.2\&.1" "FVWM\-Crystal"
+.TH "MOUSEBINDINGS" "1" "06/18/2013" "MouseBindings 3\&.2\&.1" "FVWM\-Crystal"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

Modified: man/Tips.1
===================================================================
--- man/Tips.1	2013-06-15 18:00:02 UTC (rev 510)
+++ man/Tips.1	2013-06-18 20:46:38 UTC (rev 511)
@@ -2,12 +2,12 @@
 .\"     Title: Tips
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.0 <http://docbook.sf.net/>
-.\"      Date: 06/15/2013
+.\"      Date: 06/18/2013
 .\"    Manual: FVWM-Crystal
 .\"    Source: Tips 3.2.1
 .\"  Language: English
 .\"
-.TH "TIPS" "1" "06/15/2013" "Tips 3\&.2\&.1" "FVWM\-Crystal"
+.TH "TIPS" "1" "06/18/2013" "Tips 3\&.2\&.1" "FVWM\-Crystal"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

Modified: man/fvwm-crystal.1
===================================================================
--- man/fvwm-crystal.1	2013-06-15 18:00:02 UTC (rev 510)
+++ man/fvwm-crystal.1	2013-06-18 20:46:38 UTC (rev 511)
@@ -2,12 +2,12 @@
 .\"     Title: fvwm-crystal
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.0 <http://docbook.sf.net/>
-.\"      Date: 06/15/2013
+.\"      Date: 06/18/2013
 .\"    Manual: FVWM-Crystal
 .\"    Source: fvwm-crystal 3.2.1
 .\"  Language: English
 .\"
-.TH "FVWM\-CRYSTAL" "1" "06/15/2013" "fvwm\-crystal 3\&.2\&.1" "FVWM\-Crystal"
+.TH "FVWM\-CRYSTAL" "1" "06/18/2013" "fvwm\-crystal 3\&.2\&.1" "FVWM\-Crystal"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

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