videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

libvlc: expose event for audio output device change

This commit is contained in:
Rémi Denis-Courmont 2015-07-27 16:30:33 +03:00
parent a8ffc3b821
commit fc15c20e72
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/vlc/libvlc_events.h
View File

@ -82,6 +82,7 @@ enum libvlc_event_e {
libvlc_MediaPlayerMuted,
libvlc_MediaPlayerUnmuted,
libvlc_MediaPlayerAudioVolume,
libvlc_MediaPlayerAudioDevice,
libvlc_MediaListItemAdded=0x200,
libvlc_MediaListWillAddItem,
@ -250,6 +251,11 @@ typedef struct libvlc_event_t
{
float volume;
} media_player_audio_volume;
struct
{
const char *device;
} media_player_audio_device;
} u; /**< Type-dependent event description */
} libvlc_event_t;

1
lib/event.c
View File

@ -288,6 +288,7 @@ static const event_name_t event_list[] = {
DEF(MediaPlayerMuted)
DEF(MediaPlayerUnmuted)
DEF(MediaPlayerAudioVolume)
DEF(MediaPlayerAudioDevice)
DEF(MediaListItemAdded)
DEF(MediaListWillAddItem)

16
lib/media_player.c
View File

@ -491,6 +491,19 @@ static int corks_changed(vlc_object_t *obj, const char *name, vlc_value_t old,
return VLC_SUCCESS;
}
static int audio_device_changed(vlc_object_t *obj, const char *name,
vlc_value_t old, vlc_value_t cur, void *opaque)
{
libvlc_media_player_t *mp = (libvlc_media_player_t *)obj;
libvlc_event_t event;
event.type = libvlc_MediaPlayerAudioDevice;
event.u.media_player_audio_device.device = cur.psz_string;
libvlc_event_send(mp->p_event_manager, &event);
VLC_UNUSED(name); VLC_UNUSED(old); VLC_UNUSED(opaque);
return VLC_SUCCESS;
}
static int mute_changed(vlc_object_t *obj, const char *name, vlc_value_t old,
vlc_value_t cur, void *opaque)
{
@ -702,8 +715,10 @@ libvlc_media_player_new( libvlc_instance_t *instance )
register_event(mp, Muted);
register_event(mp, Unmuted);
register_event(mp, AudioVolume);
register_event(mp, AudioDevice);
var_AddCallback(mp, "corks", corks_changed, NULL);
var_AddCallback(mp, "audio-device", audio_device_changed, NULL);
var_AddCallback(mp, "mute", mute_changed, NULL);
var_AddCallback(mp, "volume", volume_changed, NULL);
@ -759,6 +774,7 @@ static void libvlc_media_player_destroy( libvlc_media_player_t *p_mi )
/* Detach callback from the media player / input manager object */
var_DelCallback( p_mi, "volume", volume_changed, NULL );
var_DelCallback( p_mi, "mute", mute_changed, NULL );
var_DelCallback( p_mi, "audio-device", audio_device_changed, NULL );
var_DelCallback( p_mi, "corks", corks_changed, NULL );
/* No need for lock_input() because no other threads knows us anymore */