X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Finput_internal.h;h=7cd39f75baa39718df282f163f976a07bcd7b0b5;hb=11d4295550ce6496001c34d90e8ad9c9fbeaadf4;hp=d674445cba60f516e7e3df771f0e3e4fcb1a1d57;hpb=9ff8ab102772c40a6fa108a1e59b3f53d304531f;p=vlc

diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index d674445cba..7cd39f75ba 100644
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -85,15 +85,15 @@ typedef struct
 struct input_thread_private_t
 {
     /* Global properties */
+    double      f_fps;
+    int         i_state;
     bool        b_can_pause;
     bool        b_can_rate_control;
     bool        b_can_pace_control;
-    double      f_fps;
-    int         i_state;
 
     /* Current state */
-    int         i_rate;
     bool        b_recording;
+    int         i_rate;
 
     /* Playtime configuration and state */
     int64_t     i_start;    /* :start-time,0 by default */
@@ -102,6 +102,12 @@ struct input_thread_private_t
     int64_t     i_time;     /* Current time */
     bool        b_fast_seek;/* :input-fast-seek */
 
+    /* Output */
+    bool            b_out_pace_control; /* XXX Move it ot es_sout ? */
+    sout_instance_t *p_sout;            /* Idem ? */
+    es_out_t        *p_es_out;
+    es_out_t        *p_es_out_display;
+
     /* Title infos FIXME multi-input (not easy) ? */
     int          i_title;
     input_title_t **title;
@@ -118,12 +124,6 @@ struct input_thread_private_t
     int i_attachment;
     input_attachment_t **attachment;
 
-    /* Output */
-    es_out_t        *p_es_out;
-    es_out_t        *p_es_out_display;
-    sout_instance_t *p_sout;            /* XXX Move it to es_out ? */
-    bool            b_out_pace_control; /*     idem ? */
-
     /* Main input properties */
 
     /* Input item */
@@ -137,6 +137,7 @@ struct input_thread_private_t
 
     /* Resources */
     input_resource_t *p_resource;
+    input_resource_t *p_resource_private;
 
     /* Stats counters */
     struct {
@@ -179,8 +180,6 @@ enum input_control_e
     INPUT_CONTROL_SET_STATE,
 
     INPUT_CONTROL_SET_RATE,
-    INPUT_CONTROL_SET_RATE_SLOWER,
-    INPUT_CONTROL_SET_RATE_FASTER,
 
     INPUT_CONTROL_SET_POSITION,
 
@@ -220,6 +219,9 @@ enum input_control_e
  */
 void input_ControlPush( input_thread_t *, int i_type, vlc_value_t * );
 
+/* Bound pts_delay */
+#define INPUT_PTS_DELAY_MAX INT64_C(60000000)
+
 /**********************************************************************
  * Item metadata
  **********************************************************************/