* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/libvlc.h>
+#include <vlc/libvlc_media.h>
+#include <vlc/libvlc_media_player.h>
+#include <vlc_common.h>
#include <vlc_input.h>
#include <vlc_aout.h>
#include "libvlc_internal.h"
-
+#include "media_player_internal.h"
/*
* Remember to release the returned aout_instance_t since it is locked at
static aout_instance_t *GetAOut( libvlc_instance_t *p_instance,
libvlc_exception_t *p_exception )
{
+ if( !p_instance )
+ return NULL;
+
aout_instance_t * p_aout = NULL;
p_aout = vlc_object_find( p_instance->p_libvlc_int, VLC_OBJECT_AOUT, FIND_CHILD );
if( !p_aout )
{
- libvlc_exception_raise( p_exception, "No active audio output" );
+ libvlc_exception_raise( p_exception );
+ libvlc_printerr( "No active audio output" );
return NULL;
}
return p_aout;
}
+/*****************************************
+ * Get the list of available audio outputs
+ *****************************************/
+libvlc_audio_output_t *
+ libvlc_audio_output_list_get( libvlc_instance_t *p_instance,
+ libvlc_exception_t *p_e )
+{
+ VLC_UNUSED( p_instance );
+ libvlc_audio_output_t *p_list = NULL,
+ *p_actual = NULL,
+ *p_previous = NULL;
+ module_t **module_list = module_list_get( NULL );
+
+ for (size_t i = 0; module_list[i]; i++)
+ {
+ module_t *p_module = module_list[i];
+
+ if( module_provides( p_module, "audio output" ) )
+ {
+ if( p_actual == NULL)
+ {
+ p_actual = ( libvlc_audio_output_t * )
+ malloc( sizeof( libvlc_audio_output_t ) );
+ if( p_actual == NULL )
+ {
+ libvlc_exception_raise( p_e );
+ libvlc_printerr( "Not enough memory" );
+ libvlc_audio_output_list_release( p_list );
+ module_list_free( module_list );
+ return NULL;
+ }
+ if( p_list == NULL )
+ {
+ p_list = p_actual;
+ p_previous = p_actual;
+ }
+ }
+ p_actual->psz_name = strdup( module_get_object( p_module ) );
+ p_actual->psz_description = strdup( module_get_name( p_module, true ) );
+ p_actual->p_next = NULL;
+ if( p_previous != p_actual ) /* not first item */
+ p_previous->p_next = p_actual;
+ p_previous = p_actual;
+ p_actual = p_actual->p_next;
+ }
+ }
+
+ module_list_free( module_list );
+
+ return p_list;
+}
+
+/********************************************
+ * Free the list of available audio outputs
+ ***********************************************/
+void libvlc_audio_output_list_release( libvlc_audio_output_t *p_list )
+{
+ libvlc_audio_output_t *p_actual, *p_before;
+ p_actual = p_list;
+
+ while ( p_actual )
+ {
+ free( p_actual->psz_name );
+ free( p_actual->psz_description );
+ p_before = p_actual;
+ p_actual = p_before->p_next;
+ free( p_before );
+ }
+}
+
+
+/***********************
+ * Set the audio output.
+ ***********************/
+int libvlc_audio_output_set( libvlc_instance_t *p_instance,
+ const char *psz_name )
+{
+ if( module_exists( psz_name ) )
+ {
+ config_PutPsz( p_instance->p_libvlc_int, "aout", psz_name );
+ return true;
+ }
+ else
+ return false;
+}
+
+/****************************
+ * Get count of devices.
+ *****************************/
+int libvlc_audio_output_device_count( libvlc_instance_t *p_instance,
+ const char *psz_audio_output )
+{
+ char *psz_config_name;
+ if( !psz_audio_output )
+ return 0;
+ if( asprintf( &psz_config_name, "%s-audio-device", psz_audio_output ) == -1 )
+ return 0;
+
+ module_config_t *p_module_config = config_FindConfig(
+ VLC_OBJECT( p_instance->p_libvlc_int ), psz_config_name );
+
+ if( p_module_config && p_module_config->pf_update_list )
+ {
+ vlc_value_t val;
+ val.psz_string = strdup( p_module_config->value.psz );
+
+ p_module_config->pf_update_list(
+ VLC_OBJECT( p_instance->p_libvlc_int ), psz_config_name, val, val, NULL );
+ free( val.psz_string );
+ free( psz_config_name );
+
+ return p_module_config->i_list;
+ }
+
+ free( psz_config_name );
+ return 0;
+}
+
+/********************************
+ * Get long name of device
+ *********************************/
+char * libvlc_audio_output_device_longname( libvlc_instance_t *p_instance,
+ const char *psz_audio_output,
+ int i_device )
+{
+ char *psz_config_name;
+ if( !psz_audio_output )
+ return NULL;
+ if( asprintf( &psz_config_name, "%s-audio-device", psz_audio_output ) == -1 )
+ return NULL;
+
+ module_config_t *p_module_config = config_FindConfig(
+ VLC_OBJECT( p_instance->p_libvlc_int ), psz_config_name );
+
+ if( p_module_config )
+ {
+ // refresh if there arent devices
+ if( p_module_config->i_list < 2 && p_module_config->pf_update_list )
+ {
+ vlc_value_t val;
+ val.psz_string = strdup( p_module_config->value.psz );
+
+ p_module_config->pf_update_list(
+ VLC_OBJECT( p_instance->p_libvlc_int ), psz_config_name, val, val, NULL );
+ free( val.psz_string );
+ }
+ free( psz_config_name );
+
+ if( i_device >= 0 && i_device < p_module_config->i_list )
+ {
+ if( p_module_config->ppsz_list_text[i_device] )
+ return strdup( p_module_config->ppsz_list_text[i_device] );
+ else
+ return strdup( p_module_config->ppsz_list[i_device] );
+ }
+ }
+
+ free( psz_config_name );
+ return NULL;
+}
+
+/********************************
+ * Get id name of device
+ *********************************/
+char * libvlc_audio_output_device_id( libvlc_instance_t *p_instance,
+ const char *psz_audio_output,
+ int i_device )
+{
+ char *psz_config_name;
+ if( !psz_audio_output )
+ return NULL;
+ if( asprintf( &psz_config_name, "%s-audio-device", psz_audio_output ) == -1)
+ return NULL;
+
+ module_config_t *p_module_config = config_FindConfig(
+ VLC_OBJECT( p_instance->p_libvlc_int ), psz_config_name );
+
+ if( p_module_config )
+ {
+ // refresh if there arent devices
+ if( p_module_config->i_list < 2 && p_module_config->pf_update_list )
+ {
+ vlc_value_t val;
+ val.psz_string = strdup( p_module_config->value.psz );
+
+ p_module_config->pf_update_list(
+ VLC_OBJECT( p_instance->p_libvlc_int ), psz_config_name, val, val, NULL );
+ free( val.psz_string );
+ }
+ free( psz_config_name );
+
+ if( i_device >= 0 && i_device < p_module_config->i_list )
+ return strdup( p_module_config->ppsz_list[i_device] );
+
+ }
+
+ free( psz_config_name );
+ return NULL;
+}
+
+/*****************************
+ * Set device for using
+ *****************************/
+void libvlc_audio_output_device_set( libvlc_instance_t *p_instance,
+ const char *psz_audio_output,
+ const char *psz_device_id )
+{
+ char *psz_config_name = NULL;
+ if( !psz_audio_output || !psz_device_id )
+ return;
+ if( asprintf( &psz_config_name, "%s-audio-device", psz_audio_output ) == -1 )
+ return;
+ config_PutPsz( p_instance->p_libvlc_int, psz_config_name, psz_device_id );
+ free( psz_config_name );
+}
/*****************************************************************************
- * libvlc_audio_get_mute : Get the volume state, true if muted
+ * libvlc_audio_output_get_device_type : Get the current audio device type
*****************************************************************************/
-void libvlc_audio_toggle_mute( libvlc_instance_t *p_instance,
- libvlc_exception_t *p_e )
+int libvlc_audio_output_get_device_type( libvlc_instance_t *p_instance,
+ libvlc_exception_t *p_e )
{
- aout_VolumeMute( p_instance->p_libvlc_int, NULL );
+ aout_instance_t *p_aout = GetAOut( p_instance, p_e );
+ if( p_aout )
+ {
+ int i_device_type = var_GetInteger( p_aout, "audio-device" );
+ vlc_object_release( p_aout );
+ return i_device_type;
+ }
+ return libvlc_AudioOutputDevice_Error;
}
-vlc_bool_t libvlc_audio_get_mute( libvlc_instance_t *p_instance,
- libvlc_exception_t *p_e )
+/*****************************************************************************
+ * libvlc_audio_output_set_device_type : Set the audio device type
+ *****************************************************************************/
+void libvlc_audio_output_set_device_type( libvlc_instance_t *p_instance,
+ int device_type,
+ libvlc_exception_t *p_e )
{
- /*
- * If the volume level is 0, then the channel is muted
- */
- audio_volume_t i_volume;
+ aout_instance_t *p_aout = GetAOut( p_instance, p_e );
+ if( !p_aout )
+ return;
+ if( var_SetInteger( p_aout, "audio-device", device_type ) < 0 )
+ {
+ libvlc_exception_raise( p_e );
+ libvlc_printerr( "Error setting audio device" );
+ }
+ vlc_object_release( p_aout );
+}
- i_volume = libvlc_audio_get_volume(p_instance, p_e);
- if ( i_volume == 0 )
- return VLC_TRUE;
- return VLC_FALSE;
+/*****************************************************************************
+ * libvlc_audio_get_mute : Get the volume state, true if muted
+ *****************************************************************************/
+void libvlc_audio_toggle_mute( libvlc_instance_t *p_instance )
+{
+ aout_ToggleMute( p_instance->p_libvlc_int, NULL );
}
-void libvlc_audio_set_mute( libvlc_instance_t *p_instance, vlc_bool_t mute,
- libvlc_exception_t *p_e )
+int libvlc_audio_get_mute( libvlc_instance_t *p_instance )
{
- if ( mute ^ libvlc_audio_get_mute( p_instance, p_e ) )
+ return (libvlc_audio_get_volume(p_instance) == 0);
+}
+
+void libvlc_audio_set_mute( libvlc_instance_t *p_instance, int mute )
+{
+ if ( !mute != !libvlc_audio_get_mute( p_instance ) )
{
- aout_VolumeMute( p_instance->p_libvlc_int, NULL );
+ aout_ToggleMute( p_instance->p_libvlc_int, NULL );
}
}
/*****************************************************************************
* libvlc_audio_get_volume : Get the current volume (range 0-200 %)
*****************************************************************************/
-int libvlc_audio_get_volume( libvlc_instance_t *p_instance,
- libvlc_exception_t *p_e )
+int libvlc_audio_get_volume( libvlc_instance_t *p_instance )
{
audio_volume_t i_volume;
}
else
{
- libvlc_exception_raise( p_e, "Volume out of range" );
+ libvlc_exception_raise( p_e );
+ libvlc_printerr( "Volume out of range" );
}
}
/*****************************************************************************
* libvlc_audio_get_track_count : Get the number of available audio tracks
*****************************************************************************/
-int libvlc_audio_get_track_count( libvlc_media_instance_t *p_mi,
+int libvlc_audio_get_track_count( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e );
- vlc_value_t val_list;
+ int i_track_count;
if( !p_input_thread )
return -1;
- var_Change( p_input_thread, "audio-es", VLC_VAR_GETCHOICES, &val_list, NULL );
+ i_track_count = var_CountChoices( p_input_thread, "audio-es" );
+
vlc_object_release( p_input_thread );
- return val_list.p_list->i_count;
+ return i_track_count;
+}
+
+/*****************************************************************************
+ * libvlc_audio_get_track_description : Get the description of available audio tracks
+ *****************************************************************************/
+libvlc_track_description_t *
+ libvlc_audio_get_track_description( libvlc_media_player_t *p_mi,
+ libvlc_exception_t *p_e )
+{
+ return libvlc_get_track_description( p_mi, "audio-es", p_e);
}
/*****************************************************************************
* libvlc_audio_get_track : Get the current audio track
*****************************************************************************/
-int libvlc_audio_get_track( libvlc_media_instance_t *p_mi,
+int libvlc_audio_get_track( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e );
vlc_value_t val_list;
vlc_value_t val;
int i_track = -1;
- int i_ret = -1;
int i;
if( !p_input_thread )
return -1;
- i_ret = var_Get( p_input_thread, "audio-es", &val );
- if( i_ret < 0 )
+ if( var_Get( p_input_thread, "audio-es", &val ) < 0 )
{
- libvlc_exception_raise( p_e, "Getting Audio track information failed" );
vlc_object_release( p_input_thread );
- return i_ret;
+ libvlc_exception_raise( p_e );
+ 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++ )
{
- vlc_value_t track_val = val_list.p_list->p_values[i];
- if( track_val.i_int == val.i_int )
+ if( val_list.p_list->p_values[i].i_int == val.i_int )
{
i_track = i;
break;
- }
+ }
}
+ var_FreeList( &val_list, NULL );
vlc_object_release( p_input_thread );
return i_track;
}
-
/*****************************************************************************
* libvlc_audio_set_track : Set the current audio track
*****************************************************************************/
-void libvlc_audio_set_track( libvlc_media_instance_t *p_mi, int i_track,
+void libvlc_audio_set_track( libvlc_media_player_t *p_mi, int i_track,
libvlc_exception_t *p_e )
{
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e );
vlc_value_t val_list;
+ vlc_value_t newval;
int i_ret = -1;
- int i;
if( !p_input_thread )
return;
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( (i_track < 0) || (i_track > val_list.p_list->i_count) )
{
- vlc_value_t val = val_list.p_list->p_values[i];
- if( i_track == i )
- {
- i_ret = var_Set( p_input_thread, "audio-es", val );
- if( i_ret < 0 )
- {
- libvlc_exception_raise( p_e, "Setting audio track failed" );
- }
- vlc_object_release( p_input_thread );
- return;
- }
+ libvlc_exception_raise( p_e );
+ libvlc_printerr( "Audio track out of range" );
+ goto end;
}
- libvlc_exception_raise( p_e, "Audio track out of range" );
+
+ newval = val_list.p_list->p_values[i_track];
+ i_ret = var_Set( p_input_thread, "audio-es", newval );
+ if( i_ret < 0 )
+ {
+ libvlc_exception_raise( p_e );
+ libvlc_printerr( "Audio track out of range" ); /* Race... */
+ }
+
+end:
+ var_FreeList( &val_list, NULL );
vlc_object_release( p_input_thread );
}
* libvlc_audio_get_channel : Get the current audio channel
*****************************************************************************/
int libvlc_audio_get_channel( libvlc_instance_t *p_instance,
- libvlc_exception_t *p_e )
+ libvlc_exception_t *p_e )
{
aout_instance_t *p_aout = GetAOut( p_instance, p_e );
- if( p_aout )
- {
- vlc_value_t val;
+ if( !p_aout )
+ return 0;
- var_Get( p_aout, "audio-channels", &val );
- vlc_object_release( p_aout );
- return val.i_int;
- }
- return -1;
+ int val = var_GetInteger( p_aout, "audio-channels" );
+ vlc_object_release( p_aout );
+ return val;
}
/*****************************************************************************
* libvlc_audio_set_channel : Set the current audio channel
*****************************************************************************/
-void libvlc_audio_set_channel( libvlc_instance_t *p_instance, int i_channel,
+void libvlc_audio_set_channel( libvlc_instance_t *p_instance,
+ int channel,
libvlc_exception_t *p_e )
{
aout_instance_t *p_aout = GetAOut( p_instance, p_e );
- if( p_aout )
- {
- vlc_value_t val;
- int i_ret = -1;
+ if( !p_aout )
+ return;
- val.i_int = i_channel;
- switch( i_channel )
- {
- case AOUT_VAR_CHAN_RSTEREO:
- case AOUT_VAR_CHAN_STEREO:
- case AOUT_VAR_CHAN_LEFT:
- case AOUT_VAR_CHAN_RIGHT:
- case AOUT_VAR_CHAN_DOLBYS:
- i_ret = var_Set( p_aout, "audio-channels", val );
- if( i_ret < 0 )
- {
- libvlc_exception_raise( p_e, "Failed setting audio channel" );
- vlc_object_release( p_aout );
- return;
- }
- vlc_object_release( p_aout );
- return; /* Found */
- default:
- libvlc_exception_raise( p_e, "Audio channel out of range" );
- break;
- }
- vlc_object_release( p_aout );
+ if( var_SetInteger( p_aout, "audio-channels", channel ) < 0 )
+ {
+ libvlc_exception_raise( p_e );
+ libvlc_printerr( "Audio channel out of range" );
}
+ vlc_object_release( p_aout );
}
projects / vlc / blobdiff