#include <vlc_common.h>
#include <vlc_input.h>
-#include <vlc_aout_intf.h>
#include <vlc_aout.h>
#include <vlc_modules.h>
{
assert( mp != NULL );
- input_thread_t *p_input = libvlc_get_input_thread( mp );
- if( p_input == NULL )
- return NULL;
-
- audio_output_t * p_aout = input_GetAout( p_input );
- vlc_object_release( p_input );
+ audio_output_t *p_aout = input_resource_HoldAout( mp->input.p_resource );
if( p_aout == NULL )
libvlc_printerr( "No active audio output" );
return p_aout;
libvlc_audio_output_t *
libvlc_audio_output_list_get( libvlc_instance_t *p_instance )
{
- VLC_UNUSED( p_instance );
+ size_t count;
+ module_t **module_list = module_list_get( &count );
libvlc_audio_output_t *list = NULL;
- module_t **module_list = module_list_get( NULL );
- for (size_t i = 0; module_list[i]; i++)
+ for (size_t i = 0; i < count; i++)
{
module_t *module = module_list[i];
}
module_list_free( module_list );
+ VLC_UNUSED( p_instance );
return list;
}
return -1;
var_SetString( mp, "aout", value );
free( value );
+
+ /* Forget the existing audio output */
+ input_resource_ResetAout(mp->input.p_resource);
+
+ /* Create a new audio output */
+ audio_output_t *aout = input_resource_GetAout(mp->input.p_resource);
+ if( aout != NULL )
+ input_resource_PutAout(mp->input.p_resource, aout);
+
return 0;
}
+libvlc_audio_output_device_t *
+libvlc_audio_output_device_enum( libvlc_media_player_t *mp )
+{
+ audio_output_t *aout = GetAOut( mp );
+ if( aout == NULL )
+ return NULL;
+
+ libvlc_audio_output_device_t *list, **pp = &list;
+ char **values, **texts;
+
+ int n = aout_DevicesList( aout, &values, &texts );
+ vlc_object_release( aout );
+ if( n < 0 )
+ goto err;
+
+ for (int i = 0; i < n; i++)
+ {
+ libvlc_audio_output_device_t *item = malloc( sizeof(*item) );
+ if( unlikely(item == NULL) )
+ {
+ free( texts[i] );
+ free( values[i] );
+ continue;
+ }
+
+ *pp = item;
+ pp = &item->p_next;
+ item->psz_device = values[i];
+ item->psz_description = texts[i];
+ }
+
+ free( texts );
+ free( values );
+err:
+ *pp = NULL;
+ return list;
+}
+
libvlc_audio_output_device_t *
libvlc_audio_output_device_list_get( libvlc_instance_t *p_instance,
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;
* Set device for using
*****************************/
void libvlc_audio_output_device_set( libvlc_media_player_t *mp,
- const char *psz_audio_output,
- const char *psz_device_id )
+ const char *module, const char *devid )
{
- char *psz_config_name;
- if( !psz_audio_output || !psz_device_id )
+ if( devid == NULL )
return;
- if( asprintf( &psz_config_name, "%s-audio-device", psz_audio_output ) == -1 )
+
+ if( module != NULL )
+ {
+ char *cfg_name;
+
+ if( asprintf( &cfg_name, "%s-audio-device", module ) == -1 )
+ return;
+
+ if( !var_Type( mp, cfg_name ) )
+ /* Don't recreate the same variable over and over and over... */
+ var_Create( mp, cfg_name, VLC_VAR_STRING );
+ var_SetString( mp, cfg_name, devid );
+ free( cfg_name );
return;
- if( !var_Type( mp, psz_config_name ) )
- /* Don't recreate the same variable over and over and over... */
- var_Create( mp, psz_config_name, VLC_VAR_STRING );
- var_SetString( mp, psz_config_name, psz_device_id );
- free( psz_config_name );
+ }
+
+ audio_output_t *aout = GetAOut( mp );
+ if( aout == NULL )
+ return;
+
+ aout_DeviceSet( aout, devid );
+ vlc_object_release( aout );
+}
+
+char *libvlc_audio_output_device_get( libvlc_media_player_t *mp )
+{
+ audio_output_t *aout = GetAOut( mp );
+ if( aout == NULL )
+ return NULL;
+
+ char *devid = aout_DeviceGet( aout );
+
+ vlc_object_release( aout );
+
+ return devid;
}
-/*****************************************************************************
- * 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 )
{
- aout_MuteToggle( mp );
+ int mute = libvlc_audio_get_mute( mp );
+ if( mute != -1 )
+ libvlc_audio_set_mute( mp, !mute );
}
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 )
{
float vol = volume / 100.f;
- if (vol < 0.f)
+ if (!isgreaterequal(vol, 0.f))
{
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 );
if( !p_aout )
return 0;
- int val = var_GetInteger( p_aout, "audio-channels" );
+ int val = var_GetInteger( p_aout, "stereo-mode" );
vlc_object_release( p_aout );
return val;
}
if( !p_aout )
return -1;
- if( var_SetInteger( p_aout, "audio-channels", channel ) < 0 )
+ if( var_SetInteger( p_aout, "stereo-mode", channel ) < 0 )
{
libvlc_printerr( "Audio channel out of range" );
ret = -1;
if ( u_index >= EQZ_BANDS_MAX )
return -1.f;
- return f_vlc_frequency_table_10b[ u_index ];
+ return f_iso_frequency_table_10b[ u_index ];
}
/*****************************************************************************
libvlc_equalizer_t *libvlc_audio_equalizer_new( void )
{
libvlc_equalizer_t *p_equalizer;
-
p_equalizer = malloc( sizeof( *p_equalizer ) );
if ( unlikely( p_equalizer == NULL ) )
return NULL;
p_equalizer->f_preamp = 0.f;
-
for ( unsigned i = 0; i < EQZ_BANDS_MAX; i++ )
p_equalizer->f_amp[ i ] = 0.f;
*****************************************************************************/
int libvlc_audio_equalizer_set_preamp( libvlc_equalizer_t *p_equalizer, float f_preamp )
{
- if ( !p_equalizer )
+ if( isnan(f_preamp) )
return -1;
-
- if ( f_preamp < -20.0f )
- f_preamp = -20.0f;
- else if ( f_preamp > 20.0f )
- f_preamp = 20.0f;
+ if( f_preamp < -20.f )
+ f_preamp = -20.f;
+ else if( f_preamp > 20.f )
+ f_preamp = 20.f;
p_equalizer->f_preamp = f_preamp;
return 0;
*****************************************************************************/
float libvlc_audio_equalizer_get_preamp( libvlc_equalizer_t *p_equalizer )
{
- if ( !p_equalizer )
- return 0.f;
-
return p_equalizer->f_preamp;
}
*****************************************************************************/
int libvlc_audio_equalizer_set_amp_at_index( libvlc_equalizer_t *p_equalizer, float f_amp, unsigned u_band )
{
- if ( !p_equalizer )
+ if( u_band >= EQZ_BANDS_MAX || isnan(f_amp) )
return -1;
- if ( u_band >= EQZ_BANDS_MAX )
- return -1;
- if ( f_amp < -20.0f )
- f_amp = -20.0f;
- else if ( f_amp > 20.0f )
- f_amp = 20.0f;
+ if( f_amp < -20.f )
+ f_amp = -20.f;
+ else if( f_amp > 20.f )
+ f_amp = 20.f;
p_equalizer->f_amp[ u_band ] = f_amp;
return 0;
*****************************************************************************/
float libvlc_audio_equalizer_get_amp_at_index( libvlc_equalizer_t *p_equalizer, unsigned u_band )
{
- if ( !p_equalizer )
- return 0.f;
-
if ( u_band >= EQZ_BANDS_MAX )
- return 0.f;
+ return nanf("");
return p_equalizer->f_amp[ u_band ];
}
projects / vlc / blobdiff