Skip to content

V
vlc-1.1
Commit 1b79957c authored by Jean-Marc Dressler's avatar Jean-Marc Dressler
Browse files
Options

Le son fonctionne sous BeOS ! 

 Ah, vraiment, on peut dire que BeOS roulaize, les enfants.
parent ea286a76
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 13 deletions
src/audio_output/audio_output.c
View file @ 1b79957c
...@@ -156,8 +156,6 @@ aout_thread_t *aout_CreateThread( int *pi_status ) ...@@ -156,8 +156,6 @@ aout_thread_t *aout_CreateThread( int *pi_status )
/* Initialize the vomue level */ /* Initialize the vomue level */
p_aout->vol = VOL; p_aout->vol = VOL;
/* FIXME: maybe it would be cleaner to change SpawnThread prototype /* FIXME: maybe it would be cleaner to change SpawnThread prototype
* see vout to handle status correctly ?? however, it is not critical since * see vout to handle status correctly ?? however, it is not critical since
...@@ -581,18 +579,18 @@ void aout_Thread_U8_Mono( aout_thread_t * p_aout ) ...@@ -581,18 +579,18 @@ void aout_Thread_U8_Mono( aout_thread_t * p_aout )
{ {
vlc_mutex_lock( &p_aout->fifos_lock ); vlc_mutex_lock( &p_aout->fifos_lock );
for ( i_fifo = 0; i_fifo < AOUT_MAX_FIFOS; i_fifo++ ) for ( i_fifo = 0; i_fifo < AOUT_MAX_FIFOS; i_fifo++ )
{ {
switch ( p_aout->fifo[i_fifo].i_type ) switch ( p_aout->fifo[i_fifo].i_type )
{ {
case AOUT_EMPTY_FIFO: case AOUT_EMPTY_FIFO:
break; break;
case AOUT_INTF_MONO_FIFO: case AOUT_INTF_MONO_FIFO:
if ( p_aout->fifo[i_fifo].l_units > p_aout->l_units ) if ( p_aout->fifo[i_fifo].l_units > p_aout->l_units )
{ {
l_buffer = 0; l_buffer = 0;
while ( l_buffer < (p_aout->l_units /*<< 1*/) ) /* p_aout->b_stereo == 1 */ while ( l_buffer < (p_aout->l_units /*<< 1*/) ) /* p_aout->b_stereo == 1 */
{ {
p_aout->s32_buffer[l_buffer++] += p_aout->s32_buffer[l_buffer++] +=
(s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[p_aout->fifo[i_fifo].l_unit] ); (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[p_aout->fifo[i_fifo].l_unit] );
p_aout->s32_buffer[l_buffer++] += p_aout->s32_buffer[l_buffer++] +=
...@@ -602,10 +600,10 @@ void aout_Thread_U8_Mono( aout_thread_t * p_aout ) ...@@ -602,10 +600,10 @@ void aout_Thread_U8_Mono( aout_thread_t * p_aout )
p_aout->fifo[i_fifo].l_units -= p_aout->l_units; p_aout->fifo[i_fifo].l_units -= p_aout->l_units;
} }
else else
{ {
l_buffer = 0; l_buffer = 0;
while ( l_buffer < (p_aout->fifo[i_fifo].l_units /*<< 1*/) ) /* p_aout->b_stereo == 1 */ while ( l_buffer < (p_aout->fifo[i_fifo].l_units /*<< 1*/) ) /* p_aout->b_stereo == 1 */
{ {
p_aout->s32_buffer[l_buffer++] += p_aout->s32_buffer[l_buffer++] +=
(s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[p_aout->fifo[i_fifo].l_unit] ); (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[p_aout->fifo[i_fifo].l_unit] );
p_aout->s32_buffer[l_buffer++] += p_aout->s32_buffer[l_buffer++] +=
...@@ -620,10 +618,10 @@ void aout_Thread_U8_Mono( aout_thread_t * p_aout ) ...@@ -620,10 +618,10 @@ void aout_Thread_U8_Mono( aout_thread_t * p_aout )
case AOUT_INTF_STEREO_FIFO: case AOUT_INTF_STEREO_FIFO:
if ( p_aout->fifo[i_fifo].l_units > p_aout->l_units ) if ( p_aout->fifo[i_fifo].l_units > p_aout->l_units )
{ {
l_buffer = 0; l_buffer = 0;
while ( l_buffer < (p_aout->l_units /*<< 1*/) ) /* p_aout->b_stereo == 1 */ while ( l_buffer < (p_aout->l_units /*<< 1*/) ) /* p_aout->b_stereo == 1 */
{ {
p_aout->s32_buffer[l_buffer++] += p_aout->s32_buffer[l_buffer++] +=
(s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit] ); (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit] );
p_aout->s32_buffer[l_buffer++] += p_aout->s32_buffer[l_buffer++] +=
...@@ -633,10 +631,10 @@ void aout_Thread_U8_Mono( aout_thread_t * p_aout ) ...@@ -633,10 +631,10 @@ void aout_Thread_U8_Mono( aout_thread_t * p_aout )
p_aout->fifo[i_fifo].l_units -= p_aout->l_units; p_aout->fifo[i_fifo].l_units -= p_aout->l_units;
} }
else else
{ {
l_buffer = 0; l_buffer = 0;
while ( l_buffer < (p_aout->fifo[i_fifo].l_units /*<< 1*/) ) /* p_aout->b_stereo == 1 */ while ( l_buffer < (p_aout->fifo[i_fifo].l_units /*<< 1*/) ) /* p_aout->b_stereo == 1 */
{ {
p_aout->s32_buffer[l_buffer++] += p_aout->s32_buffer[l_buffer++] +=
(s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit] ); (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit] );
p_aout->s32_buffer[l_buffer++] += p_aout->s32_buffer[l_buffer++] +=
...@@ -927,7 +925,6 @@ intf_DbgMsg( "%d - p_aout->s32b %ld\n", l_buffer, (s32) ( ((s16 *)p_aout->fifo[i ...@@ -927,7 +925,6 @@ intf_DbgMsg( "%d - p_aout->s32b %ld\n", l_buffer, (s32) ( ((s16 *)p_aout->fifo[i
} }
vlc_mutex_unlock( &p_aout->fifos_lock ); vlc_mutex_unlock( &p_aout->fifos_lock );
} }
void aout_Thread_U8_Stereo( aout_thread_t * p_aout ) void aout_Thread_U8_Stereo( aout_thread_t * p_aout )
......
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