Commit 70042746 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Rename "volume-muted" to simply "mute"

parent 633914e3
...@@ -957,7 +957,7 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf ) ...@@ -957,7 +957,7 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf )
var_AddCallback( THEPL, "loop", LoopChanged, this ); var_AddCallback( THEPL, "loop", LoopChanged, this );
var_AddCallback( THEPL, "volume-change", VolumeChanged, 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 */ /* Warn our embedded IM about input changes */
DCONNECT( this, inputChanged( input_thread_t * ), DCONNECT( this, inputChanged( input_thread_t * ),
...@@ -988,7 +988,7 @@ MainInputManager::~MainInputManager() ...@@ -988,7 +988,7 @@ MainInputManager::~MainInputManager()
} }
var_DelCallback( THEPL, "volume-change", VolumeChanged, this ); 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, "activity", PLItemChanged, this );
var_DelCallback( THEPL, "item-change", ItemChanged, im ); var_DelCallback( THEPL, "item-change", ItemChanged, im );
......
...@@ -71,7 +71,7 @@ static void prepareVolume (vlc_object_t *obj, aout_instance_t **aoutp, ...@@ -71,7 +71,7 @@ static void prepareVolume (vlc_object_t *obj, aout_instance_t **aoutp,
if (volp != NULL) if (volp != NULL)
*volp = config_GetInt (obj, "volume"); *volp = config_GetInt (obj, "volume");
if (mutep != NULL) if (mutep != NULL)
*mutep = var_GetBool (obj, "volume-muted"); *mutep = var_GetBool (obj, "mute");
} }
/** Commit a volume change transaction. */ /** Commit a volume change transaction. */
...@@ -83,7 +83,7 @@ static int commitVolume (vlc_object_t *obj, aout_instance_t *aout, ...@@ -83,7 +83,7 @@ static int commitVolume (vlc_object_t *obj, aout_instance_t *aout,
config_PutInt (obj, "volume", volume); config_PutInt (obj, "volume", volume);
if (mute) if (mute)
volume = AOUT_VOLUME_MIN; volume = AOUT_VOLUME_MIN;
var_SetBool (obj, "volume-muted", mute); var_SetBool (obj, "mute", mute);
if (aout != NULL) if (aout != NULL)
{ {
...@@ -213,7 +213,7 @@ bool aout_IsMuted (vlc_object_t *obj) ...@@ -213,7 +213,7 @@ bool aout_IsMuted (vlc_object_t *obj)
cancelVolume (obj, aout); cancelVolume (obj, aout);
return mute; return mute;
#else #else
return var_GetBool (obj, "volume-muted"); return var_GetBool (obj, "mute");
#endif #endif
} }
......
...@@ -454,7 +454,7 @@ libvlc_media_player_new( libvlc_instance_t *instance ) ...@@ -454,7 +454,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
/* Audio */ /* Audio */
var_Create (mp, "aout", VLC_VAR_STRING | VLC_VAR_DOINHERIT); 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, "saved-volume", VLC_VAR_INTEGER);
var_Create (mp, "volume-change", VLC_VAR_VOID); var_Create (mp, "volume-change", VLC_VAR_VOID);
var_Create (mp, "find-input-callback", VLC_VAR_ADDRESS); var_Create (mp, "find-input-callback", VLC_VAR_ADDRESS);
......
...@@ -432,7 +432,7 @@ static void VariablesInit( playlist_t *p_playlist ) ...@@ -432,7 +432,7 @@ static void VariablesInit( playlist_t *p_playlist )
var_Create( p_playlist, "video-on-top", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); var_Create( p_playlist, "video-on-top", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
/* Audio output parameters */ /* 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, "saved-volume", VLC_VAR_INTEGER );
var_Create( p_playlist, "volume-change", VLC_VAR_VOID ); var_Create( p_playlist, "volume-change", VLC_VAR_VOID );
/* FIXME: horrible hack for audio output interface code */ /* FIXME: horrible hack for audio output interface code */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment