X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Fmixer.c;h=0e73a2109cffcc7fa952073e01fc76e6999e88b5;hb=4bf5e817d35569492c6c3ca068f277d0ae49702f;hp=ee15f59fdf46712aefb3636aad1fa7527f4acda7;hpb=99fab9089e9e1709d9c3a4bc5ced0c137ac59134;p=vlc

diff --git a/src/audio_output/mixer.c b/src/audio_output/mixer.c
index ee15f59fdf..0e73a2109c 100644
--- a/src/audio_output/mixer.c
+++ b/src/audio_output/mixer.c
@@ -28,7 +28,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <stddef.h>
+#include <vlc_common.h>
 
 #ifdef HAVE_ALLOCA_H
 #   include <alloca.h>
@@ -110,7 +111,7 @@ static int MixBuffer( aout_instance_t * p_aout )
         /* The output is _very_ late. This can only happen if the user
          * pauses the stream (or if the decoder is buggy, which cannot
          * happen :). */
-        msg_Warn( p_aout, "output PTS is out of range ("I64Fd"), clearing out",
+        msg_Warn( p_aout, "output PTS is out of range (%"PRId64"), clearing out",
                   mdate() - start_date );
         aout_FifoSet( p_aout, &p_aout->output.fifo, 0 );
         aout_DateSet( &exact_start_date, 0 );
@@ -135,7 +136,7 @@ static int MixBuffer( aout_instance_t * p_aout )
             p_buffer = p_fifo->p_first;
             while ( p_buffer != NULL && p_buffer->start_date < mdate() )
             {
-                msg_Warn( p_aout, "input PTS is out of range ("I64Fd"), "
+                msg_Warn( p_aout, "input PTS is out of range (%"PRId64"), "
                           "trashing", mdate() - p_buffer->start_date );
                 p_buffer = aout_FifoPop( p_aout, p_fifo );
                 aout_BufferFree( p_buffer );
@@ -178,7 +179,7 @@ static int MixBuffer( aout_instance_t * p_aout )
         aout_fifo_t * p_fifo = &p_input->fifo;
         aout_buffer_t * p_buffer;
         mtime_t prev_date;
-        vlc_bool_t b_drop_buffers;
+        bool b_drop_buffers;
 
         if ( p_input->b_error )
         {
@@ -198,7 +199,7 @@ static int MixBuffer( aout_instance_t * p_aout )
             /* We authorize a +-1 because rounding errors get compensated
              * regularly. */
             aout_buffer_t * p_next = p_buffer->p_next;
-            msg_Warn( p_aout, "the mixer got a packet in the past ("I64Fd")",
+            msg_Warn( p_aout, "the mixer got a packet in the past (%"PRId64")",
                       start_date - p_buffer->end_date );
             aout_BufferFree( p_buffer );
             if( p_input->p_input_thread )
@@ -231,7 +232,7 @@ static int MixBuffer( aout_instance_t * p_aout )
                 if ( prev_date != p_buffer->start_date )
                 {
                     msg_Warn( p_aout,
-                              "buffer hole, dropping packets ("I64Fd")",
+                              "buffer hole, dropping packets (%"PRId64")",
                               p_buffer->start_date - prev_date );
                     b_drop_buffers = 1;
                     break;
@@ -277,7 +278,7 @@ static int MixBuffer( aout_instance_t * p_aout )
                    (i_nb_bytes < p_aout->mixer.mixer.i_bytes_per_frame
                      + mixer_nb_bytes)) )
             {
-                msg_Warn( p_aout, "mixer start isn't output start ("I64Fd")",
+                msg_Warn( p_aout, "mixer start isn't output start (%"PRId64")",
                           i_nb_bytes - mixer_nb_bytes );
 
                 /* Round to the nearest multiple */
@@ -313,7 +314,6 @@ static int MixBuffer( aout_instance_t * p_aout )
                       p_output_buffer );
     if ( p_output_buffer == NULL )
     {
-        msg_Err( p_aout, "out of memory" );
         vlc_mutex_unlock( &p_aout->input_fifos_lock );
         return -1;
     }
@@ -356,7 +356,7 @@ void aout_MixerRun( aout_instance_t * p_aout )
 int aout_MixerMultiplierSet( aout_instance_t * p_aout, float f_multiplier )
 {
     float f_old = p_aout->mixer.f_multiplier;
-    vlc_bool_t b_new_mixer = 0;
+    bool b_new_mixer = 0;
 
     if ( !p_aout->mixer.b_error )
     {