Rename "volume-muted" to simply "mute"

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index c39b4bfb954fe756f4a08774b34f751c970a394b..e2978850e0d3a570a97770a82b8cdd7fa62fab95 100644 (file)
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -957,7 +957,7 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf )
     var_AddCallback( THEPL, "loop", LoopChanged, this );
 
     var_AddCallback( THEPL, "volume-change", VolumeChanged, this );
-    var_AddCallback( THEPL, "volume-muted", SoundMuteChanged, this );
+    var_AddCallback( THEPL, "mute", SoundMuteChanged, this );
 
     /* Warn our embedded IM about input changes */
     DCONNECT( this, inputChanged( input_thread_t * ),
@@ -988,7 +988,7 @@ MainInputManager::~MainInputManager()
     }
 
     var_DelCallback( THEPL, "volume-change", VolumeChanged, this );
-    var_DelCallback( THEPL, "volume-muted", SoundMuteChanged, this );
+    var_DelCallback( THEPL, "mute", SoundMuteChanged, this );
 
     var_DelCallback( THEPL, "activity", PLItemChanged, this );
     var_DelCallback( THEPL, "item-change", ItemChanged, im );

diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index f89b064eb98ade3447474cb750d9f3ff26d0a5ea..f3c6e20abb58a55d8d5b02acf16b499cb72766f0 100644 (file)
--- a/src/audio_output/intf.c
+++ b/src/audio_output/intf.c
@@ -71,7 +71,7 @@ static void prepareVolume (vlc_object_t *obj, aout_instance_t **aoutp,
     if (volp != NULL)
         *volp = config_GetInt (obj, "volume");
     if (mutep != NULL)
-        *mutep = var_GetBool (obj, "volume-muted");
+        *mutep = var_GetBool (obj, "mute");
 }
 
 /** Commit a volume change transaction. */
@@ -83,7 +83,7 @@ static int commitVolume (vlc_object_t *obj, aout_instance_t *aout,
     config_PutInt (obj, "volume", volume);
     if (mute)
         volume = AOUT_VOLUME_MIN;
-    var_SetBool (obj, "volume-muted", mute);
+    var_SetBool (obj, "mute", mute);
 
     if (aout != NULL)
     {
@@ -213,7 +213,7 @@ bool aout_IsMuted (vlc_object_t *obj)
     cancelVolume (obj, aout);
     return mute;
 #else
-    return var_GetBool (obj, "volume-muted");
+    return var_GetBool (obj, "mute");
 #endif
 }
 

diff --git a/src/control/media_player.c b/src/control/media_player.c
index bca99ff8fe5b22cba08169dc53ea7a52db3ba50f..d7d5a7fb823399d5a3905ce95b5f5e9c649a0294 100644 (file)
--- a/src/control/media_player.c
+++ b/src/control/media_player.c
@@ -454,7 +454,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
 
      /* Audio */
     var_Create (mp, "aout", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
-    var_Create (mp, "volume-muted", VLC_VAR_BOOL);
+    var_Create (mp, "mute", VLC_VAR_BOOL);
     var_Create (mp, "saved-volume", VLC_VAR_INTEGER);
     var_Create (mp, "volume-change", VLC_VAR_VOID);
     var_Create (mp, "find-input-callback", VLC_VAR_ADDRESS);

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 6d968b8a769f17c5d0309b79d98e3205b700969c..a040bd6dc5a32ff32794707e6051beb88e6d2597 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -432,7 +432,7 @@ static void VariablesInit( playlist_t *p_playlist )
     var_Create( p_playlist, "video-on-top", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
 
     /* Audio output parameters */
-    var_Create( p_playlist, "volume-muted", VLC_VAR_BOOL );
+    var_Create( p_playlist, "mute", VLC_VAR_BOOL );
     var_Create( p_playlist, "saved-volume", VLC_VAR_INTEGER );
     var_Create( p_playlist, "volume-change", VLC_VAR_VOID );
     /* FIXME: horrible hack for audio output interface code */