* audio_output/audio_output.c :

- suppression d'une macro inutile ;
- proprification d'une ligne de code obscur ;

diff --git a/src/audio_output/audio_output.c b/src/audio_output/audio_output.c
index dc65daf321a2b76ba2dac0995d795fcfc2cb328f..94cd271bf6bd0c49e9da7de2a0f0f332ad307fa8 100644 (file)
--- a/src/audio_output/audio_output.c
+++ b/src/audio_output/audio_output.c
@@ -422,9 +422,6 @@ void aout_DestroyFifo( aout_fifo_t * p_fifo )
 
 /* Here are the local macros */
 
-#define S32_TO_S16( sample ) \
-    (s16)( (sample) )
-
 #define UPDATE_INCREMENT( increment, integer ) \
     if ( ((increment).l_remainder += (increment).l_euclidean_remainder) >= 0 ) \
     { \
@@ -844,7 +841,7 @@ void aout_Thread_S16_Stereo( aout_thread_t * p_aout )
 
         for ( l_buffer = 0; l_buffer < l_buffer_limit; l_buffer++ )
        {
-            ((s16 *)p_aout->buffer)[l_buffer] = S32_TO_S16( p_aout->s32_buffer[l_buffer] / AOUT_MAX_FIFOS );
+            ((s16 *)p_aout->buffer)[l_buffer] = (s16)( p_aout->s32_buffer[l_buffer] / AOUT_MAX_FIFOS );
             p_aout->s32_buffer[l_buffer] = 0;
         }