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

aout_MuteGet: fix name and add VLC_OBJECT() magic cast

parent 18a70b6d
......@@ -40,7 +40,8 @@ VLC_API int aout_MuteToggle( vlc_object_t * );
#define aout_MuteToggle(a) aout_MuteToggle(VLC_OBJECT(a))
VLC_API int aout_MuteSet( vlc_object_t *, bool );
#define aout_MuteSet(a, b) aout_MuteSet(VLC_OBJECT(a), b)
VLC_API bool aout_IsMuted( vlc_object_t * );
VLC_API int aout_MuteGet( vlc_object_t * );
#define aout_MuteGet(a) aout_MuteGet(VLC_OBJECT(a))
VLC_API void aout_EnableFilter( vlc_object_t *, const char *, bool );
#define aout_EnableFilter( o, n, b ) \
......
......@@ -318,7 +318,7 @@ void libvlc_audio_toggle_mute( libvlc_media_player_t *mp )
int libvlc_audio_get_mute( libvlc_media_player_t *mp )
{
return aout_IsMuted( VLC_OBJECT(mp) );
return aout_MuteGet( mp );
}
void libvlc_audio_set_mute( libvlc_media_player_t *mp, int mute )
......
......@@ -203,7 +203,7 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
case ACTIONID_VOL_MUTE:
if( aout_MuteToggle( p_playlist ) == 0 && p_vout != NULL )
{
if( aout_IsMuted( VLC_OBJECT(p_playlist) ) )
if( aout_MuteGet( p_playlist ) > 0 )
{
ClearChannels( p_intf, p_vout );
DisplayIcon( p_vout, OSD_MUTE_ICON );
......
......@@ -504,7 +504,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
return NO;
BOOL b_is_muted = NO;
b_is_muted = aout_IsMuted( VLC_OBJECT(pl_Get( p_intf )) );
b_is_muted = aout_MuteGet( pl_Get( p_intf ) ) > 0;
return b_is_muted;
}
......
......@@ -185,7 +185,7 @@ void SoundWidget::valueChangedFilter( int i_val )
void SoundWidget::updateMuteStatus()
{
playlist_t *p_playlist = pl_Get( p_intf );
b_is_muted = aout_IsMuted( VLC_OBJECT(p_playlist) );
b_is_muted = aout_MuteGet( p_playlist ) > 0;
SoundSlider *soundSlider = qobject_cast<SoundSlider *>(volumeSlider);
if( soundSlider )
......
......@@ -695,7 +695,7 @@ void VlcProc::on_volume_changed( vlc_object_t* p_obj, vlc_value_t newVal )
audio_volume_t volume = aout_VolumeGet( pPlaylist );
SET_VOLUME( m_cVarVolume, volume, false );
bool b_is_muted = aout_IsMuted( VLC_OBJECT(pPlaylist) );
bool b_is_muted = aout_MuteGet( pPlaylist ) > 0;
SET_BOOL( m_cVarMute, b_is_muted );
}
......@@ -800,7 +800,7 @@ void VlcProc::init_variables()
audio_volume_t volume = aout_VolumeGet( pPlaylist );
SET_VOLUME( m_cVarVolume, volume, false );
bool b_is_muted = aout_IsMuted( VLC_OBJECT(pPlaylist) );
bool b_is_muted = aout_MuteGet( pPlaylist ) > 0;
SET_BOOL( m_cVarMute, b_is_muted );
update_equalizer();
......
......@@ -195,10 +195,12 @@ int aout_MuteToggle (vlc_object_t *obj)
return commitVolume (obj, aout, vol, mute);
}
#undef aout_MuteGet
/**
* Gets the output mute status.
* \return 0 if not muted, 1 if muted, -1 if undefined.
*/
bool aout_IsMuted (vlc_object_t *obj)
int aout_MuteGet (vlc_object_t *obj)
{
audio_output_t *aout;
bool mute;
......
......@@ -19,7 +19,7 @@ aout_VolumeSet
aout_VolumeUp
aout_MuteToggle
aout_MuteSet
aout_IsMuted
aout_MuteGet
aout_VolumeSoftInit
aout_VolumeHardInit
block_Alloc
......
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