* skins2:

    - new possible action vlc.mute() to mute/un-mute
    - vlc.isMute is now working well (in a boolean expression)

diff --git a/modules/gui/skins2/commands/cmd_input.cpp b/modules/gui/skins2/commands/cmd_input.cpp
index d6b4e944a6bf903b2a29d35a9f0940474f90236d..a64fba179714994927212181cfe166dc7b5cf1b6 100644 (file)
--- a/modules/gui/skins2/commands/cmd_input.cpp
+++ b/modules/gui/skins2/commands/cmd_input.cpp
@@ -2,7 +2,7 @@
  * cmd_input.cpp
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: cmd_input.cpp,v 1.2 2004/01/18 19:54:45 asmax Exp $
+ * $Id$
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
  *          Olivier Teulière <ipkiss@via.ecp.fr>
@@ -22,6 +22,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
+#include <vlc/aout.h>
 #include "cmd_input.hpp"
 
 
@@ -92,3 +93,9 @@ void CmdFaster::execute()
     }
 }
 
+
+void CmdMute::execute()
+{
+    aout_VolumeMute( getIntf(), NULL );
+}
+

diff --git a/modules/gui/skins2/commands/cmd_input.hpp b/modules/gui/skins2/commands/cmd_input.hpp
index 3bc19cc54e785eb439745b13ac6527d52994d0c4..94c5588fedbcab871a688f6829a810089ff51d13 100644 (file)
--- a/modules/gui/skins2/commands/cmd_input.hpp
+++ b/modules/gui/skins2/commands/cmd_input.hpp
@@ -2,7 +2,7 @@
  * cmd_input.hpp
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: cmd_input.hpp,v 1.3 2004/01/25 17:20:18 kuehne Exp $
+ * $Id$
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
  *          Olivier Teulière <ipkiss@via.ecp.fr>
@@ -28,11 +28,12 @@
 #include "cmd_generic.hpp"
 
 /// Commands to control the input
-DEFINE_COMMAND( Play, "Play" ) 
+DEFINE_COMMAND( Play, "play" )
 DEFINE_COMMAND( Pause, "pause" )
-DEFINE_COMMAND( Stop, "Stop" ) 
+DEFINE_COMMAND( Stop, "stop" )
 DEFINE_COMMAND( Slower, "slower" )
 DEFINE_COMMAND( Faster, "faster" )
+DEFINE_COMMAND( Mute, "mute" )
 
 
 #endif

diff --git a/modules/gui/skins2/parser/interpreter.cpp b/modules/gui/skins2/parser/interpreter.cpp
index f475ab2a26d6b01e3ce362ba88b06c4f0120772b..9d1f37e497234c7e10f04ee8cd3413c7ca697b38 100644 (file)
--- a/modules/gui/skins2/parser/interpreter.cpp
+++ b/modules/gui/skins2/parser/interpreter.cpp
@@ -71,10 +71,11 @@ Interpreter::Interpreter( intf_thread_t *pIntf ): SkinObject( pIntf )
     REGISTER_CMD( "vlc.fullscreen()", CmdFullscreen )
     REGISTER_CMD( "vlc.play()", CmdPlay )
     REGISTER_CMD( "vlc.pause()", CmdPause )
-    REGISTER_CMD( "vlc.quit()", CmdQuit )
+    REGISTER_CMD( "vlc.stop()", CmdStop )
     REGISTER_CMD( "vlc.faster()", CmdFaster )
     REGISTER_CMD( "vlc.slower()", CmdSlower )
-    REGISTER_CMD( "vlc.stop()", CmdStop )
+    REGISTER_CMD( "vlc.mute()", CmdMute )
+    REGISTER_CMD( "vlc.quit()", CmdQuit )
 
     // Register the constant bool variables in the var manager
     VarManager *pVarManager = VarManager::instance( getIntf() );

diff --git a/modules/gui/skins2/src/vlcproc.cpp b/modules/gui/skins2/src/vlcproc.cpp
index a8dfa2dac8f2ff13fb8b77cc509ad89d678cb44b..c6e9ec281115ed9689b4bd7b20bb5ff36b49732f 100755 (executable)
--- a/modules/gui/skins2/src/vlcproc.cpp
+++ b/modules/gui/skins2/src/vlcproc.cpp
@@ -149,13 +149,16 @@ void VlcProc::manage()
     VarBoolImpl *pVarStopped = (VarBoolImpl*)m_cVarStopped.get();
     VarBoolImpl *pVarPaused = (VarBoolImpl*)m_cVarPaused.get();
     VarBoolImpl *pVarSeekable = (VarBoolImpl*)m_cVarSeekable.get();
+    VarBoolImpl *pVarMute = (VarBoolImpl*)m_cVarMute.get();
     VarBoolImpl *pVarRandom = (VarBoolImpl*)m_cVarRandom.get();
     VarBoolImpl *pVarLoop = (VarBoolImpl*)m_cVarLoop.get();
 
     // Refresh sound volume
     audio_volume_t volume;
-    aout_VolumeGet( getIntf(), &volume);
+    aout_VolumeGet( getIntf(), &volume );
     pVolume->set( (double)volume / AOUT_VOLUME_MAX );
+    // Set the mute variable
+    pVarMute->set( volume == 0 );
 
     // Update the input
     if( getIntf()->p_sys->p_input == NULL )