More clean up on subtitle.

[vlc] / src / audio_output / output.c

diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index 16c55e4adaa287f7f3107e4e9ccbd1e9371a8b22..b799855b43db43ac012c2ce0837f088aac515b64 100644 (file)
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_aout.h>
 #include "aout_internal.h"
 
@@ -156,7 +156,7 @@ int aout_OutputNew( aout_instance_t * p_aout,
         var_AddCallback( p_aout, "audio-channels", aout_ChannelsRestart,
                          NULL );
     }
-    val.b_bool = VLC_TRUE;
+    val.b_bool = true;
     var_Set( p_aout, "intf-change", val );
 
     aout_FormatPrepare( &p_aout->output.output );
@@ -236,7 +236,7 @@ void aout_OutputDelete( aout_instance_t * p_aout )
     aout_FifoDestroy( p_aout, &p_aout->output.fifo );
     vlc_mutex_unlock( &p_aout->output_fifo_lock );
 
-    p_aout->output.b_error = VLC_TRUE;
+    p_aout->output.b_error = true;
 }
 
 /*****************************************************************************
@@ -272,7 +272,7 @@ void aout_OutputPlay( aout_instance_t * p_aout, aout_buffer_t * p_buffer )
  *****************************************************************************/
 aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout,
                                        mtime_t start_date,
-                                       vlc_bool_t b_can_sleek )
+                                       bool b_can_sleek )
 {
     aout_buffer_t * p_buffer;
 
@@ -286,8 +286,8 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout,
     while ( p_buffer && p_buffer->start_date <
             (b_can_sleek ? start_date : mdate()) - AOUT_PTS_TOLERANCE )
     {
-        msg_Dbg( p_aout, "audio output is too slow ("I64Fd"), "
-                 "trashing "I64Fd"us", mdate() - p_buffer->start_date,
+        msg_Dbg( p_aout, "audio output is too slow (%"PRId64"), "
+                 "trashing %"PRId64"us", mdate() - p_buffer->start_date,
                  p_buffer->end_date - p_buffer->start_date );
         p_buffer = p_buffer->p_next;
         aout_BufferFree( p_aout->output.fifo.p_first );
@@ -330,7 +330,7 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout,
         vlc_mutex_unlock( &p_aout->output_fifo_lock );
 
         if ( !p_aout->output.b_starving )
-            msg_Dbg( p_aout, "audio output is starving ("I64Fd"), "
+            msg_Dbg( p_aout, "audio output is starving (%"PRId64"), "
                      "playing silence", i_delta );
         p_aout->output.b_starving = 1;
         return NULL;
@@ -346,7 +346,7 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout,
         int i;
         mtime_t difference = start_date - p_buffer->start_date;
         msg_Warn( p_aout, "output date isn't PTS date, requesting "
-                  "resampling ("I64Fd")", difference );
+                  "resampling (%"PRId64")", difference );
 
         vlc_mutex_lock( &p_aout->input_fifos_lock );
         for ( i = 0; i < p_aout->i_nb_inputs; i++ )