Move kept sout instance to playlist private data

[vlc] / src / input / input_internal.h

diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index b0069e7f124d183c002cbb32e39735501603ea7f..b3e57165f58a11c3376b948afdf2d706cc0e94cc 100644 (file)
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -63,6 +63,7 @@ typedef struct
     bool b_can_pause;
     bool b_can_pace_control;
     bool b_can_rate_control;
+    bool b_can_stream_record;
     bool b_rescale_ts;
 
     bool       b_eof;   /* eof of demuxer */
@@ -84,6 +85,7 @@ struct input_thread_private_t
     bool        b_can_rate_control;
 
     int         i_rate;
+    bool        b_recording;
     /* */
     int64_t     i_start;    /* :start-time,0 by default */
     int64_t     i_stop;     /* :stop-time, 0 if none */
@@ -116,10 +118,11 @@ struct input_thread_private_t
     input_source_t **slave;
 
     /* pts delay fixup */
-    struct {
+    struct
+    {
         int  i_num_faulty;
-        bool to_high;
-        bool auto_adjust;
+        bool b_to_high;
+        bool b_auto_adjust;
     } pts_adjust;
 
     /* Stats counters */
@@ -186,11 +189,14 @@ enum input_control_e
     INPUT_CONTROL_SET_BOOKMARK,
 
     INPUT_CONTROL_SET_ES,
+    INPUT_CONTROL_RESTART_ES,
 
     INPUT_CONTROL_SET_AUDIO_DELAY,
     INPUT_CONTROL_SET_SPU_DELAY,
 
     INPUT_CONTROL_ADD_SLAVE,
+
+    INPUT_CONTROL_SET_RECORD_STATE,
 };
 
 /* Internal helpers */
@@ -206,14 +212,13 @@ static inline void input_ControlPush( input_thread_t *p_input,
         memset( &p_input->p->control[0].val, 0, sizeof( vlc_value_t ) );
     }
     else
+    if( p_input->p->i_control >= INPUT_CONTROL_FIFO_SIZE )
+    {
+        msg_Err( p_input, "input control fifo overflow, trashing type=%d",
+                 i_type );
+    }
+    else
     {
-        if( p_input->p->i_control >= INPUT_CONTROL_FIFO_SIZE )
-        {
-            msg_Err( p_input, "input control fifo overflow, trashing type=%d",
-                     i_type );
-            vlc_mutex_unlock( &p_input->p->lock_control );
-            return;
-        }
         p_input->p->control[p_input->p->i_control].i_type = i_type;
         if( p_val )
             p_input->p->control[p_input->p->i_control].val = *p_val;
@@ -242,7 +247,7 @@ static inline void input_item_SetPreparsed( input_item_t *p_i, bool preparsed )
         new_status = p_i->p_meta->i_status | ITEM_PREPARSED;
     else
         new_status = p_i->p_meta->i_status & ~ITEM_PREPARSED;
-    if ( p_i->p_meta->i_status != new_status )
+    if( p_i->p_meta->i_status != new_status )
     {
         p_i->p_meta->i_status = new_status;
         send_event = true;
@@ -250,7 +255,7 @@ static inline void input_item_SetPreparsed( input_item_t *p_i, bool preparsed )
 
     vlc_mutex_unlock( &p_i->lock );
 
-    if ( send_event == true )
+    if( send_event )
     {
         vlc_event_t event;
         event.type = vlc_InputItemPreparsedChanged;
@@ -339,6 +344,7 @@ es_out_t  *input_EsOutNew( input_thread_t *, int i_rate );
 void       input_EsOutDelete( es_out_t * );
 es_out_id_t *input_EsOutGetFromID( es_out_t *, int i_id );
 void       input_EsOutSetDelay( es_out_t *, int i_cat, int64_t );
+int        input_EsOutSetRecord(  es_out_t *, bool b_record );
 void       input_EsOutChangeRate( es_out_t *, int );
 void       input_EsOutChangeState( es_out_t * );
 void       input_EsOutChangePosition( es_out_t * );
@@ -383,8 +389,6 @@ void    input_ClockSetRate( input_clock_t *cl, int i_rate );
 char **subtitles_Detect( input_thread_t *, char* path, const char *fname );
 int subtitles_Filter( const char *);
 
-void MRLSplit( char *, const char **, const char **, char ** );
-
 static inline void input_ChangeStateWithVarCallback( input_thread_t *p_input, int state, bool callback )
 {
     const bool changed = p_input->i_state != state;
@@ -417,6 +421,10 @@ static inline void input_ChangeState( input_thread_t *p_input, int state )
     input_ChangeStateWithVarCallback( p_input, state, true );
 }
 
+/* Helpers FIXME to export without input_ prefix */
+char *input_CreateFilename( vlc_object_t *p_obj, const char *psz_path, const char *psz_prefix, const char *psz_extension );
+
+#define INPUT_RECORD_PREFIX "vlc-record-%Y-%m-%d-%H:%M:%S-$ N-$ p"
 
 /* Access */
 
@@ -464,8 +472,8 @@ struct stream_t
     VLC_COMMON_MEMBERS
 
     /*block_t *(*pf_block)  ( stream_t *, int i_size );*/
-    int      (*pf_read)   ( stream_t *, void *p_read, int i_read );
-    int      (*pf_peek)   ( stream_t *, const uint8_t **pp_peek, int i_peek );
+    int      (*pf_read)   ( stream_t *, void *p_read, unsigned int i_read );
+    int      (*pf_peek)   ( stream_t *, const uint8_t **pp_peek, unsigned int i_peek );
     int      (*pf_control)( stream_t *, int i_query, va_list );
     void     (*pf_destroy)( stream_t *);