From 3fada58d1eddf3a17434acf0e106bac0a7ac9372 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Cl=C3=A9ment=20Stenac?= <zorglub@videolan.org>
Date: Sun, 26 Nov 2006 17:27:16 +0000
Subject: [PATCH] Make the global b_can_pace_control flag public

---
 include/vlc_input.h           | 3 +++
 modules/gui/macosx/controls.m | 6 +-----
 src/input/clock.c             | 4 ++--
 src/input/input.c             | 8 ++++----
 src/input/input_internal.h    | 1 -
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/include/vlc_input.h b/include/vlc_input.h
index f366b18774..a6825f30e8 100644
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -351,8 +351,11 @@ struct input_thread_t
 
     vlc_bool_t  b_eof;
     vlc_bool_t b_preparsing;
+
     int i_state;
+    vlc_bool_t b_can_pace_control;
     int64_t     i_time;     /* Current time */
+
     /* Internal caching common to all inputs */
     int i_pts_delay;
 
diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index fe53d299c5..0f53bff28c 100644
--- a/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@ -39,10 +39,6 @@
 #import "playlist.h"
 #include <vlc_osd.h>
 
-/* UGLY UGLY UGLY FIXME FIXME FIXME. Need solution for b_can_pace_control.
- * Put it public ? Is it needed here ?*/
-#include "../../../src/input/input_internal.h"
-
 /*****************************************************************************
  * VLCControls implementation 
  *****************************************************************************/
@@ -788,7 +784,7 @@
     {
         if( p_input != NULL )
         {
-            bEnabled = p_input->p->input.b_can_pace_control;
+            bEnabled = p_input->b_can_pace_control;
         }
         else
         {
diff --git a/src/input/clock.c b/src/input/clock.c
index 8632faac92..9f10c7d04f 100644
--- a/src/input/clock.c
+++ b/src/input/clock.c
@@ -247,7 +247,7 @@ void input_ClockSetPCR( input_thread_t *p_input,
                      cl->last_pts + CR_MEAN_PTS_GAP : mdate() );
         cl->i_synchro_state = SYNCHRO_OK;
 
-        if( p_input->p->b_can_pace_control && cl->b_master )
+        if( p_input->b_can_pace_control && cl->b_master )
         {
             cl->last_cr = i_clock;
             if( !p_input->p->b_out_pace_control )
@@ -288,7 +288,7 @@ void input_ClockSetPCR( input_thread_t *p_input,
 
         cl->last_cr = i_clock;
 
-        if( p_input->p->b_can_pace_control && cl->b_master )
+        if( p_input->b_can_pace_control && cl->b_master )
         {
             /* Wait a while before delivering the packets to the decoder.
              * In case of multiple programs, we arbitrarily follow the
diff --git a/src/input/input.c b/src/input/input.c
index 482fffd7d1..9e12126476 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -137,7 +137,7 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
 
     /* Init Common fields */
     p_input->b_eof = VLC_FALSE;
-    p_input->p->b_can_pace_control = VLC_TRUE;
+    p_input->b_can_pace_control = VLC_TRUE;
     p_input->p->i_start = 0;
     p_input->i_time  = 0;
     p_input->p->i_stop  = 0;
@@ -809,7 +809,7 @@ static int Init( input_thread_t * p_input )
         }
 
         /* Global flag */
-        p_input->p->b_can_pace_control = p_input->p->input.b_can_pace_control;
+        p_input->b_can_pace_control = p_input->p->input.b_can_pace_control;
         p_input->p->b_can_pause        = p_input->p->input.b_can_pause;
 
         /* Fix pts delay */
@@ -1044,7 +1044,7 @@ static int Init( input_thread_t * p_input )
                 p_input->p->b_out_pace_control = VLC_TRUE;
             }
 
-            if( p_input->p->b_can_pace_control && p_input->p->b_out_pace_control )
+            if( p_input->b_can_pace_control && p_input->p->b_out_pace_control )
             {
                 /* We don't want a high input priority here or we'll
                  * end-up sucking up all the CPU time */
@@ -1498,7 +1498,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type,
                 i_rate = INPUT_RATE_MAX;
             }
             if( i_rate != INPUT_RATE_DEFAULT &&
-                ( !p_input->p->b_can_pace_control ||
+                ( !p_input->b_can_pace_control ||
                   ( p_input->p->p_sout && !p_input->p->b_out_pace_control ) ) )
             {
                 msg_Dbg( p_input, "cannot change rate" );
diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index 1ef106c18d..b59df10bc5 100644
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -69,7 +69,6 @@ typedef struct
 struct input_thread_private_t
 {
     /* Global properties */
-    vlc_bool_t  b_can_pace_control;
     vlc_bool_t  b_can_pause;
 
     int         i_rate;
-- 
2.39.2