Commit d068701b authored by Christophe Massiot's avatar Christophe Massiot

* Fixed BeOS output ;

* Fixed a few boolean_t.
parent 5ffbc97e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* aout.cpp: BeOS audio output * aout.cpp: BeOS audio output
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN * Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: AudioOutput.cpp,v 1.3 2002/08/19 11:51:03 tcastley Exp $ * $Id: AudioOutput.cpp,v 1.4 2002/08/19 21:54:37 massiot Exp $
* *
* Authors: Jean-Marc Dressler <polux@via.ecp.fr> * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -63,7 +63,7 @@ struct aout_sys_t ...@@ -63,7 +63,7 @@ struct aout_sys_t
*****************************************************************************/ *****************************************************************************/
static int SetFormat ( aout_instance_t * ); static int SetFormat ( aout_instance_t * );
//static int GetBufInfo ( aout_instance_t *, int ); //static int GetBufInfo ( aout_instance_t *, int );
static void Play ( aout_instance_t *, aout_buffer_t * ); static void Play ( aout_instance_t * );
/***************************************************************************** /*****************************************************************************
* OpenAudio: opens a BPushGameSound * OpenAudio: opens a BPushGameSound
...@@ -138,9 +138,9 @@ static int SetFormat( aout_instance_t *p_aout ) ...@@ -138,9 +138,9 @@ static int SetFormat( aout_instance_t *p_aout )
***************************************************************************** *****************************************************************************
* This function writes a buffer of i_length bytes in the dsp * This function writes a buffer of i_length bytes in the dsp
*****************************************************************************/ *****************************************************************************/
static void Play( aout_instance_t *p_aout, static void Play( aout_instance_t *p_aout )
aout_buffer_t *p_buffer )
{ {
aout_buffer_t * p_buffer = aout_FifoPop( p_aout, &p_aout->output.fifo );
int i_newbuf_pos; int i_newbuf_pos;
if( (i_newbuf_pos = p_aout->output.p_sys->i_buffer_pos + p_buffer->i_size) if( (i_newbuf_pos = p_aout->output.p_sys->i_buffer_pos + p_buffer->i_size)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* filters.c : audio output filters management * filters.c : audio output filters management
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: filters.c,v 1.5 2002/08/19 21:31:11 massiot Exp $ * $Id: filters.c,v 1.6 2002/08/19 21:54:37 massiot Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -76,13 +76,13 @@ static int SplitConversion( aout_instance_t * p_aout, ...@@ -76,13 +76,13 @@ static int SplitConversion( aout_instance_t * p_aout,
const audio_sample_format_t * p_input_format, const audio_sample_format_t * p_input_format,
const audio_sample_format_t * p_output_format, const audio_sample_format_t * p_output_format,
audio_sample_format_t * p_middle_format, audio_sample_format_t * p_middle_format,
boolean_t b_format_first, vlc_bool_t b_format_first,
boolean_t b_rate_first ) vlc_bool_t b_rate_first )
{ {
boolean_t b_format = vlc_bool_t b_format =
(p_input_format->i_format != p_output_format->i_format); (p_input_format->i_format != p_output_format->i_format);
boolean_t b_rate = (p_input_format->i_rate != p_output_format->i_rate); vlc_bool_t b_rate = (p_input_format->i_rate != p_output_format->i_rate);
boolean_t b_channels = vlc_bool_t b_channels =
(p_input_format->i_channels != p_output_format->i_channels); (p_input_format->i_channels != p_output_format->i_channels);
int i_nb_conversions = b_format + b_rate + b_channels; int i_nb_conversions = b_format + b_rate + b_channels;
...@@ -160,7 +160,7 @@ int aout_FiltersCreatePipeline( aout_instance_t * p_aout, ...@@ -160,7 +160,7 @@ int aout_FiltersCreatePipeline( aout_instance_t * p_aout,
const audio_sample_format_t * p_output_format ) const audio_sample_format_t * p_output_format )
{ {
audio_sample_format_t temp_format; audio_sample_format_t temp_format;
boolean_t b_format_first, b_rate_first; vlc_bool_t b_format_first, b_rate_first;
if ( AOUT_FMTS_IDENTICAL( p_input_format, p_output_format ) ) if ( AOUT_FMTS_IDENTICAL( p_input_format, p_output_format ) )
{ {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* mixer.c : audio output mixing operations * mixer.c : audio output mixing operations
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: mixer.c,v 1.6 2002/08/19 21:31:11 massiot Exp $ * $Id: mixer.c,v 1.7 2002/08/19 21:54:37 massiot Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -92,7 +92,7 @@ void aout_MixerRun( aout_instance_t * p_aout ) ...@@ -92,7 +92,7 @@ void aout_MixerRun( aout_instance_t * p_aout )
aout_fifo_t * p_fifo = &p_input->fifo; aout_fifo_t * p_fifo = &p_input->fifo;
aout_buffer_t * p_buffer; aout_buffer_t * p_buffer;
mtime_t prev_date; mtime_t prev_date;
boolean_t b_drop_buffers; vlc_bool_t b_drop_buffers;
vlc_mutex_lock( &p_fifo->lock ); vlc_mutex_lock( &p_fifo->lock );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment