Qt: don't limit the artLabel in width

[vlc] / src / input / input_internal.h

diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index bb49f442cfb0736dda2a78e93e1a9474097f434a..1ade60c1a82f0931def1f83d7389e64f9592e365 100644 (file)
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -21,12 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if defined(__PLUGIN__) || defined(__BUILTIN__) || !defined(__LIBVLC__)
-# error This header file can only be included from LibVLC.
-#endif
-
-#ifndef _INPUT_INTERNAL_H
-#define _INPUT_INTERNAL_H 1
+#ifndef LIBVLC_INPUT_INTERNAL_H
+#define LIBVLC_INPUT_INTERNAL_H 1
 
 #include <vlc_access.h>
 #include <vlc_demux.h>
@@ -75,19 +71,25 @@ typedef struct
 
 } input_source_t;
 
+typedef struct
+{
+    int         i_type;
+    vlc_value_t val;
+} input_control_t;
+
 /** Private input fields */
 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 */
@@ -96,6 +98,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;
@@ -112,12 +120,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 */
@@ -129,8 +131,9 @@ struct input_thread_private_t
     int            i_slave;
     input_source_t **slave;
 
-    /* Ressources */
-    input_ressource_t *p_ressource;
+    /* Resources */
+    input_resource_t *p_resource;
+    input_resource_t *p_resource_private;
 
     /* Stats counters */
     struct {
@@ -139,6 +142,8 @@ struct input_thread_private_t
         counter_t *p_input_bitrate;
         counter_t *p_demux_read;
         counter_t *p_demux_bitrate;
+        counter_t *p_demux_corrupted;
+        counter_t *p_demux_discontinuity;
         counter_t *p_decoded_audio;
         counter_t *p_decoded_video;
         counter_t *p_decoded_sub;
@@ -156,13 +161,11 @@ struct input_thread_private_t
     vlc_mutex_t lock_control;
     vlc_cond_t  wait_control;
     int i_control;
-    struct
-    {
-        /* XXX for string value you have to allocate it before calling
-         * input_ControlPush */
-        int         i_type;
-        vlc_value_t val;
-    } control[INPUT_CONTROL_FIFO_SIZE];
+    input_control_t control[INPUT_CONTROL_FIFO_SIZE];
+
+    bool b_abort;
+    bool is_running;
+    vlc_thread_t thread;
 };
 
 /***************************************************************************
@@ -175,14 +178,10 @@ 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,
-    INPUT_CONTROL_SET_POSITION_OFFSET,
 
     INPUT_CONTROL_SET_TIME,
-    INPUT_CONTROL_SET_TIME_OFFSET,
 
     INPUT_CONTROL_SET_PROGRAM,
 
@@ -212,8 +211,15 @@ enum input_control_e
 };
 
 /* Internal helpers */
+
+/* XXX for string value you have to allocate it before calling
+ * input_ControlPush
+ */
 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
  **********************************************************************/
@@ -237,4 +243,8 @@ void input_ConfigVarInit ( input_thread_t * );
 char **subtitles_Detect( input_thread_t *, char* path, const char *fname );
 int subtitles_Filter( const char *);
 
+/* input.c */
+void input_SplitMRL( const char **, const char **, const char **,
+                     const char **, char * );
+
 #endif