#include <vlc_common.h>
#include <vlc_input.h>
-#include <vlc_aout_intf.h>
#include <vlc_aout.h>
#include <vlc_modules.h>
const char *aout )
{
char varname[32];
- if( (size_t)snprintf( varname, sizeof(varname), "%s-output-device", aout )
+ if( (size_t)snprintf( varname, sizeof(varname), "%s-audio-device", aout )
>= sizeof(varname) )
return NULL;
free( psz_config_name );
}
-/*****************************************************************************
- * libvlc_audio_output_get_device_type : Get the current audio device type
- *****************************************************************************/
int libvlc_audio_output_get_device_type( libvlc_media_player_t *mp )
{
- audio_output_t *p_aout = GetAOut( mp );
- if( p_aout )
- {
- int i_device_type = var_GetInteger( p_aout, "audio-device" );
- vlc_object_release( p_aout );
- return i_device_type;
- }
+ (void) mp;
return libvlc_AudioOutputDevice_Error;
}
-/*****************************************************************************
- * libvlc_audio_output_set_device_type : Set the audio device type
- *****************************************************************************/
void libvlc_audio_output_set_device_type( libvlc_media_player_t *mp,
int device_type )
{
- audio_output_t *p_aout = GetAOut( mp );
- if( !p_aout )
- return;
- if( var_SetInteger( p_aout, "audio-device", device_type ) < 0 )
- libvlc_printerr( "Error setting audio device" );
- vlc_object_release( p_aout );
+ (void) mp; (void) device_type;
}
void libvlc_audio_toggle_mute( libvlc_media_player_t *mp )
int libvlc_audio_get_mute( libvlc_media_player_t *mp )
{
- return aout_MuteGet( mp );
+ int mute = -1;
+
+ audio_output_t *aout = GetAOut( mp );
+ if( aout != NULL )
+ {
+ mute = aout_MuteGet( aout );
+ vlc_object_release( aout );
+ }
+ return mute;
}
void libvlc_audio_set_mute( libvlc_media_player_t *mp, int mute )
{
- aout_MuteSet( VLC_OBJECT(mp), mute != 0 );
+ audio_output_t *aout = GetAOut( mp );
+ if( aout != NULL )
+ {
+ mute = aout_MuteSet( aout, mute );
+ vlc_object_release( aout );
+ }
}
int libvlc_audio_get_volume( libvlc_media_player_t *mp )
{
- float vol = aout_VolumeGet( mp );
- return ( vol >= 0.f ) ? lroundf( vol * 100.f ) : -1;
+ int volume = -1;
+
+ audio_output_t *aout = GetAOut( mp );
+ if( aout != NULL )
+ {
+ float vol = aout_VolumeGet( aout );
+ vlc_object_release( aout );
+ volume = lroundf( vol * 100.f );
+ }
+ return volume;
}
int libvlc_audio_set_volume( libvlc_media_player_t *mp, int volume )
libvlc_printerr( "Volume out of range" );
return -1;
}
- aout_VolumeSet (mp, vol);
- return 0;
+
+ int ret = -1;
+ audio_output_t *aout = GetAOut( mp );
+ if( aout != NULL )
+ {
+ ret = aout_VolumeSet( aout, vol );
+ vlc_object_release( aout );
+ }
+ return ret;
}
/*****************************************************************************
int libvlc_audio_get_track( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
- vlc_value_t val_list;
- vlc_value_t val;
- int i_track = -1;
- int i;
-
if( !p_input_thread )
return -1;
- if( var_Get( p_input_thread, "audio-es", &val ) < 0 )
- {
- vlc_object_release( p_input_thread );
- libvlc_printerr( "Audio track information not found" );
- return -1;
- }
-
- var_Change( p_input_thread, "audio-es", VLC_VAR_GETCHOICES, &val_list, NULL );
- for( i = 0; i < val_list.p_list->i_count; i++ )
- {
- if( val_list.p_list->p_values[i].i_int == val.i_int )
- {
- i_track = i;
- break;
- }
- }
- var_FreeList( &val_list, NULL );
+ int id = var_GetInteger( p_input_thread, "audio-es" );
vlc_object_release( p_input_thread );
- return i_track;
+ return id;
}
/*****************************************************************************
{
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
vlc_value_t val_list;
- vlc_value_t newval;
- int i_ret;
+ int i_ret = -1;
if( !p_input_thread )
return -1;
var_Change( p_input_thread, "audio-es", VLC_VAR_GETCHOICES, &val_list, NULL );
- if( (i_track < 0) || (i_track > val_list.p_list->i_count) )
- {
- libvlc_printerr( "Audio track out of range" );
- i_ret = -1;
- goto end;
- }
-
- newval = val_list.p_list->p_values[i_track];
- i_ret = var_Set( p_input_thread, "audio-es", newval );
- if( i_ret < 0 )
+ for( int i = 0; i < val_list.p_list->i_count; i++ )
{
- libvlc_printerr( "Audio track out of range" ); /* Race... */
- i_ret = -1;
- goto end;
+ if( i_track == val_list.p_list->p_values[i].i_int )
+ {
+ if( var_SetInteger( p_input_thread, "audio-es", i_track ) < 0 )
+ break;
+ i_ret = 0;
+ goto end;
+ }
}
- i_ret = 0;
-
+ libvlc_printerr( "Track identifier not found" );
end:
var_FreeList( &val_list, NULL );
vlc_object_release( p_input_thread );