vlc_cond_t signal;
vlc_mutex_t lock_signal;
bool b_signal;
+ bool b_error;
} pa_thread_t;
uint32_t i_channels;
};
-static const uint32_t pi_channels_in[] =
- { AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
- AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT,
- AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
- AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0 };
static const uint32_t pi_channels_out[] =
{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
AOUT_CHAN_CENTER, AOUT_CHAN_LFE,
- AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
+ AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, AOUT_CHAN_REARCENTER,
AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT, 0 };
#ifdef PORTAUDIO_IS_SERIOUSLY_BROKEN
static bool b_init = 0;
static pa_thread_t *pa_thread;
-static void PORTAUDIOThread( pa_thread_t * );
+static void* PORTAUDIOThread( vlc_object_t * );
#endif
/*****************************************************************************
#define DEVICE_TEXT N_("Output device")
#define DEVICE_LONGTEXT N_("Portaudio identifier for the output device")
-vlc_module_begin();
- set_shortname( "PortAudio" );
- set_description( N_("PORTAUDIO audio output") );
- set_category( CAT_AUDIO );
- set_subcategory( SUBCAT_AUDIO_AOUT );
- add_integer( "portaudio-device", 0, NULL,
- DEVICE_TEXT, DEVICE_LONGTEXT, false );
- set_capability( "audio output", 0 );
- set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+ set_shortname( "PortAudio" )
+ set_description( N_("PORTAUDIO audio output") )
+ set_category( CAT_AUDIO )
+ set_subcategory( SUBCAT_AUDIO_AOUT )
+ add_integer( "portaudio-audio-device", 0, NULL,
+ DEVICE_TEXT, DEVICE_LONGTEXT, false )
+ add_deprecated_alias( "portaudio-device" ) /* deprecated since 0.9.3 */
+ set_capability( "audio output", 0 )
+ set_callbacks( Open, Close )
+vlc_module_end ()
/* This routine will be called by the PortAudio engine when audio is needed.
* It may called at interrupt level on some machines so don't do anything
const PaStreamCallbackTimeInfo *paDate,
PaStreamCallbackFlags statusFlags, void *p_cookie )
{
+ VLC_UNUSED( inputBuffer ); VLC_UNUSED( statusFlags );
+
struct aout_sys_t *p_sys = (struct aout_sys_t*) p_cookie;
aout_instance_t *p_aout = p_sys->p_aout;
aout_buffer_t *p_buffer;
if( p_sys->b_chan_reorder )
{
/* Do the channel reordering here */
- aout_ChannelReorder( p_buffer->p_buffer, p_buffer->i_nb_bytes,
+ aout_ChannelReorder( p_buffer->p_buffer, p_buffer->i_buffer,
p_sys->i_channels, p_sys->pi_chan_table,
p_sys->i_bits_per_sample );
}
{
aout_instance_t *p_aout = (aout_instance_t *)p_this;
struct aout_sys_t * p_sys;
- vlc_value_t val;
- int i_err;
msg_Dbg( p_aout, "entering Open()");
/* Allocate p_sys structure */
- p_sys = (aout_sys_t *)malloc( sizeof(aout_sys_t) );
+ p_sys = malloc( sizeof(aout_sys_t) );
if( p_sys == NULL )
return VLC_ENOMEM;
p_sys->p_aout = p_aout;
p_aout->output.pf_play = Play;
/* Retrieve output device id from config */
- var_Create( p_aout, "portaudio-device", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT);
- var_Get( p_aout, "portaudio-device", &val );
- p_sys->i_device_id = val.i_int;
+ p_sys->i_device_id = var_CreateGetInteger( p_aout, "portaudio-audio-device" );
#ifdef PORTAUDIO_IS_SERIOUSLY_BROKEN
if( !b_init )
{
+ int i_err;
+
/* Test device */
if( PAOpenDevice( p_aout ) != VLC_SUCCESS )
{
pa_thread->p_aout = p_aout;
pa_thread->b_error = false;
vlc_mutex_init( &pa_thread->lock_wait );
- vlc_cond_init( p_aout, &pa_thread->wait );
+ vlc_cond_init( &pa_thread->wait );
pa_thread->b_wait = false;
vlc_mutex_init( &pa_thread->lock_signal );
- vlc_cond_init( p_aout, &pa_thread->signal );
+ vlc_cond_init( &pa_thread->signal );
pa_thread->b_signal = false;
/* Create PORTAUDIOThread */
if( vlc_thread_create( pa_thread, "aout", PORTAUDIOThread,
- VLC_THREAD_PRIORITY_OUTPUT, false ) )
+ VLC_THREAD_PRIORITY_OUTPUT ) )
{
msg_Err( p_aout, "cannot create PORTAUDIO thread" );
return VLC_EGENERIC;
{
aout_instance_t *p_aout = (aout_instance_t *)p_this;
aout_sys_t *p_sys = p_aout->output.p_sys;
- int i_err;
msg_Dbg( p_aout, "closing portaudio");
#else
- i_err = Pa_StopStream( p_sys->p_stream );
+ int i_err = Pa_StopStream( p_sys->p_stream );
if( i_err != paNoError )
{
msg_Err( p_aout, "Pa_StopStream: %d (%s)", i_err,
if( p_sys->deviceInfo->maxOutputChannels >= 1 )
{
val.i_int = AOUT_VAR_MONO;
- text.psz_string = N_("Mono");
+ text.psz_string = _("Mono");
var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE,
&val, &text );
msg_Dbg( p_aout, "device supports 1 channel" );
if( p_sys->deviceInfo->maxOutputChannels >= 2 )
{
val.i_int = AOUT_VAR_STEREO;
- text.psz_string = N_("Stereo");
+ text.psz_string = _("Stereo");
var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE,
&val, &text );
var_Change( p_aout, "audio-device", VLC_VAR_SETDEFAULT,
if( p_sys->deviceInfo->maxOutputChannels >= 4 )
{
val.i_int = AOUT_VAR_2F2R;
- text.psz_string = N_("2 Front 2 Rear");
+ text.psz_string = _("2 Front 2 Rear");
var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE,
&val, &text );
msg_Dbg( p_aout, "device supports 4 channels" );
if( p_sys->deviceInfo->maxOutputChannels >= 5 )
{
val.i_int = AOUT_VAR_3F2R;
- text.psz_string = N_("3 Front 2 Rear");
+ text.psz_string = _("3 Front 2 Rear");
var_Change( p_aout, "audio-device",
VLC_VAR_ADDCHOICE, &val, &text );
msg_Dbg( p_aout, "device supports 5 channels" );
if( p_sys->deviceInfo->maxOutputChannels >= 6 )
{
val.i_int = AOUT_VAR_5_1;
- text.psz_string = "5.1";
+ text.psz_string = _("5.1");
var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE,
&val, &text );
msg_Dbg( p_aout, "device supports 5.1 channels" );
}
var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL );
-
- val.b_bool = true;
- var_Set( p_aout, "intf-change", val );
+ var_SetBool( p_aout, "intf-change", true );
}
/* Audio format is paFloat32 (always supported by portaudio v19) */
- p_aout->output.output.i_format = VLC_FOURCC('f','l','3','2');
+ p_aout->output.output.i_format = VLC_CODEC_FL32;
return VLC_SUCCESS;
p_aout->output.p_sys->i_channels = i_channels;
p_aout->output.p_sys->b_chan_reorder =
- aout_CheckChannelReorder( pi_channels_in, pi_channels_out,
+ aout_CheckChannelReorder( NULL, pi_channels_out,
i_channel_mask, i_channels,
p_aout->output.p_sys->pi_chan_table );
*****************************************************************************/
static void Play( aout_instance_t * p_aout )
{
+ VLC_UNUSED( p_aout );
}
#ifdef PORTAUDIO_IS_SERIOUSLY_BROKEN
* PORTAUDIOThread: all interactions with libportaudio.a are handled
* in this single thread. Otherwise libportaudio.a is _not_ happy :-(
*****************************************************************************/
-static void PORTAUDIOThread( pa_thread_t *pa_thread )
+static void* PORTAUDIOThread( vlc_object_t *p_this )
{
+ pa_thread_t *pa_thread = (pa_thread_t*)p_this;
aout_instance_t *p_aout;
aout_sys_t *p_sys;
int i_err;
+ int canc = vlc_savecancel ();
while( vlc_object_alive (pa_thread) )
{
vlc_cond_signal( &pa_thread->wait );
vlc_mutex_unlock( &pa_thread->lock_wait );
}
+ vlc_restorecancel (canc);
+ return NULL;
}
#endif
projects / vlc / blobdiff