Browse Source

aout: add support for libvlc_audio_get_name

Alexandre Janniaux 5 years ago
parent
commit
fbdb3a8ff2
  1. 1
      include/vlc/libvlc_media_player.h
  2. 1
      include/vlc_aout.h
  3. 13
      lib/audio.c
  4. 1
      lib/libvlc.sym
  5. 8
      src/audio_output/output.c
  6. 1
      src/libvlccore.sym

1
include/vlc/libvlc_media_player.h

@ -2377,6 +2377,7 @@ LIBVLC_API void libvlc_audio_output_device_set( libvlc_media_player_t *mp,
* \version LibVLC 3.0.0 or later.
*/
LIBVLC_API char *libvlc_audio_output_device_get( libvlc_media_player_t *mp );
LIBVLC_API const char *libvlc_audio_output_get_name( libvlc_media_player_t *mp );
/**
* Toggle mute status.

1
include/vlc_aout.h

@ -400,6 +400,7 @@ VLC_API int aout_VolumeSet (audio_output_t *, float);
VLC_API int aout_VolumeUpdate (audio_output_t *, int, float *);
VLC_API int aout_MuteGet (audio_output_t *);
VLC_API int aout_MuteSet (audio_output_t *, bool);
VLC_API const char *aout_NameGet (audio_output_t *);
VLC_API char *aout_DeviceGet (audio_output_t *);
VLC_API int aout_DeviceSet (audio_output_t *, const char *);
VLC_API int aout_DevicesList (audio_output_t *, char ***, char ***);

13
lib/audio.c

@ -250,6 +250,19 @@ void libvlc_audio_output_device_set( libvlc_media_player_t *mp,
aout_Release(aout);
}
const char *libvlc_audio_output_get_name( libvlc_media_player_t *mp )
{
audio_output_t *aout = GetAOut( mp );
if( aout == NULL )
return NULL;
const char *devid = aout_NameGet( aout );
aout_Release(aout);
return devid;
}
char *libvlc_audio_output_device_get( libvlc_media_player_t *mp )
{
audio_output_t *aout = GetAOut( mp );

1
lib/libvlc.sym

@ -22,6 +22,7 @@ libvlc_audio_output_device_set
libvlc_audio_output_list_get
libvlc_audio_output_list_release
libvlc_audio_output_set
libvlc_audio_output_get_name
libvlc_audio_get_channel
libvlc_audio_get_delay
libvlc_audio_get_mute

8
src/audio_output/output.c

@ -867,6 +867,14 @@ int aout_MuteSet (audio_output_t *aout, bool mute)
return ret ? -1 : 0;
}
const char *aout_NameGet (audio_output_t *aout)
{
aout_owner_t *owner = aout_owner (aout);
if (owner->module)
return module_get_name(owner->module, false);
return NULL;
}
/**
* Gets the currently selected device.
* \return the selected device ID (caller must free() it)

1
src/libvlccore.sym

@ -17,6 +17,7 @@ aout_VolumeSet
aout_VolumeUpdate
aout_MuteSet
aout_MuteGet
aout_NameGet
aout_DeviceGet
aout_DeviceSet
aout_DevicesList

Loading…
Cancel
Save