Moved input_item_t from input_source_t to input_thread_private_t.

[vlc] / src / input / input_internal.h

diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index 7165bd91a31e0356438a27590af1f1e4f9710180..66a38e0bff2159cd5b7621256f42e7b13c996392 100644 (file)
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -43,9 +43,6 @@
 /* input_source_t: gathers all information per input source */
 typedef struct
 {
-    /* Input item description */
-    input_item_t *p_item;
-
     /* Access/Stream/Demux plugins */
     access_t *p_access;
     stream_t *p_stream;
@@ -118,6 +115,8 @@ struct input_thread_private_t
     bool            b_out_pace_control; /*     idem ? */
 
     /* Main input properties */
+    input_item_t *p_item;
+
     input_source_t input;
     /* Slave demuxers (subs, and others) */
     int            i_slave;
@@ -212,8 +211,6 @@ void input_ControlPush( input_thread_t *, int i_type, vlc_value_t * );
  *  Becarefull; p_item lock HAS to be taken */
 void input_ExtractAttachmentAndCacheArt( input_thread_t *p_input );
 
-void input_item_SetErrorWhenReading( input_item_t *p_i, bool b_error );
-
 /***************************************************************************
  * Internal prototypes
  ***************************************************************************/