Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
035898d1
Commit
035898d1
authored
Jul 02, 2012
by
Rémi Denis-Courmont
Browse files
aout_MuteGet: fix name and add VLC_OBJECT() magic cast
parent
18a70b6d
Changes
8
Hide whitespace changes
Inline
Side-by-side
include/vlc_aout_intf.h
View file @
035898d1
...
...
@@ -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 ) \
...
...
lib/audio.c
View file @
035898d1
...
...
@@ -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_
Is
Mute
d
(
VLC_OBJECT
(
mp
)
);
return
aout_Mute
Get
(
mp
);
}
void
libvlc_audio_set_mute
(
libvlc_media_player_t
*
mp
,
int
mute
)
...
...
modules/control/hotkeys.c
View file @
035898d1
...
...
@@ -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_
Is
Mute
d
(
VLC_OBJECT
(
p_playlist
)
)
)
if
(
aout_Mute
Get
(
p_playlist
)
>
0
)
{
ClearChannels
(
p_intf
,
p_vout
);
DisplayIcon
(
p_vout
,
OSD_MUTE_ICON
);
...
...
modules/gui/macosx/CoreInteraction.m
View file @
035898d1
...
...
@@ -504,7 +504,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
return
NO
;
BOOL
b_is_muted
=
NO
;
b_is_muted
=
aout_
Is
Mute
d
(
VLC_OBJECT
(
pl_Get
(
p_intf
))
)
;
b_is_muted
=
aout_Mute
Get
(
pl_Get
(
p_intf
)
)
>
0
;
return
b_is_muted
;
}
...
...
modules/gui/qt4/components/controller_widget.cpp
View file @
035898d1
...
...
@@ -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_
Is
Mute
d
(
VLC_OBJECT
(
p_playlist
)
)
;
b_is_muted
=
aout_Mute
Get
(
p_playlist
)
>
0
;
SoundSlider
*
soundSlider
=
qobject_cast
<
SoundSlider
*>
(
volumeSlider
);
if
(
soundSlider
)
...
...
modules/gui/skins2/src/vlcproc.cpp
View file @
035898d1
...
...
@@ -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_
Is
Mute
d
(
VLC_OBJECT
(
pPlaylist
)
)
;
bool
b_is_muted
=
aout_Mute
Get
(
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_
Is
Mute
d
(
VLC_OBJECT
(
pPlaylist
)
)
;
bool
b_is_muted
=
aout_Mute
Get
(
pPlaylist
)
>
0
;
SET_BOOL
(
m_cVarMute
,
b_is_muted
);
update_equalizer
();
...
...
src/audio_output/intf.c
View file @
035898d1
...
...
@@ -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_
Is
Mute
d
(
vlc_object_t
*
obj
)
int
aout_Mute
Get
(
vlc_object_t
*
obj
)
{
audio_output_t
*
aout
;
bool
mute
;
...
...
src/libvlccore.sym
View file @
035898d1
...
...
@@ -19,7 +19,7 @@ aout_VolumeSet
aout_VolumeUp
aout_MuteToggle
aout_MuteSet
aout_
Is
Mute
d
aout_Mute
Get
aout_VolumeSoftInit
aout_VolumeHardInit
block_Alloc
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment