X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fclock.c;h=27ab13ae76cbac1caa7d830edc87b1567279380b;hb=10a6bde56813620846826fed6979b2548a6457ea;hp=03e8299fe98cfd22b4aa1802aa89ac4d26ca5085;hpb=c352d28ffd5381ee96ce7f3f77809ebd430311be;p=vlc

diff --git a/src/input/clock.c b/src/input/clock.c
index 03e8299fe9..27ab13ae76 100644
--- a/src/input/clock.c
+++ b/src/input/clock.c
@@ -24,7 +24,11 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 
 #include "input_internal.h"
 
@@ -71,7 +75,7 @@ static void ClockNewRef( input_clock_t * p_pgrm,
  *****************************************************************************/
 
 /* Maximum gap allowed between two CRs. */
-#define CR_MAX_GAP (I64C(2000000)*100/9)
+#define CR_MAX_GAP (INT64_C(2000000)*100/9)
 
 /* Latency introduced on DVDs with CR == 0 on chapter change - this is from
  * my dice --Meuuh */
@@ -114,8 +118,7 @@ static void ClockNewRef( input_clock_t *cl,
  * input_ClockInit: reinitializes the clock reference after a stream
  *                  discontinuity
  *****************************************************************************/
-void input_ClockInit( input_thread_t *p_input,
-                      input_clock_t *cl, vlc_bool_t b_master, int i_cr_average, int i_rate )
+void input_ClockInit( input_clock_t *cl, bool b_master, int i_cr_average, int i_rate )
 {
     cl->i_synchro_state = SYNCHRO_START;
 
@@ -139,7 +142,7 @@ void input_ClockInit( input_thread_t *p_input,
 void input_ClockSetPCR( input_thread_t *p_input,
                         input_clock_t *cl, mtime_t i_clock )
 {
-    const vlc_bool_t b_synchronize = p_input->b_can_pace_control && cl->b_master;
+    const bool b_synchronize = p_input->b_can_pace_control && cl->b_master;
     const mtime_t i_mdate = mdate();
 
     if( ( cl->i_synchro_state != SYNCHRO_OK ) ||
@@ -165,7 +168,7 @@ void input_ClockSetPCR( input_thread_t *p_input,
          * warning from the stream control facilities (dd-edited
          * stream ?). */
         msg_Warn( p_input, "clock gap, unexpected stream discontinuity" );
-        input_ClockInit( p_input, cl, cl->b_master, cl->i_cr_average, cl->i_rate );
+        input_ClockInit( cl, cl->b_master, cl->i_cr_average, cl->i_rate );
         /* Feed synchro with a new reference point. */
         msg_Warn( p_input, "feeding synchro with a new reference point trying to recover from clock gap" );
         ClockNewRef( cl, i_clock,
@@ -211,7 +214,7 @@ void input_ClockSetPCR( input_thread_t *p_input,
 /*****************************************************************************
  * input_ClockResetPCR:
  *****************************************************************************/
-void input_ClockResetPCR( input_thread_t * p_input, input_clock_t *cl )
+void input_ClockResetPCR( input_clock_t *cl )
 {
     cl->i_synchro_state =  SYNCHRO_REINIT;
     cl->last_pts = 0;
@@ -233,7 +236,7 @@ mtime_t input_ClockGetTS( input_thread_t * p_input,
 /*****************************************************************************
  * input_ClockSetRate:
  *****************************************************************************/
-void input_ClockSetRate( input_thread_t *p_input, input_clock_t *cl, int i_rate )
+void input_ClockSetRate( input_clock_t *cl, int i_rate )
 {
     /* Move the reference point */
     if( cl->i_synchro_state == SYNCHRO_OK )