sout: remove sout_instance_t for real

(also sout_cfg_t)

extras/analyser/vlc.vim

@@ -66,7 +66,6 @@ function VlcSyntax()
   " Images
   syn keyword cType image_handler_t
   " Sout
-  syn keyword cType sout_instance_t sout_cfg_t
   syn keyword cType sout_input_t sout_packetizer_input_t
   syn keyword cType sout_access_out_t sout_access_out_sys_t 
   syn keyword cType sout_mux_t sout_mux_sys_t

include/vlc_common.h

@@ -395,8 +395,6 @@ typedef struct subpicture_region_t subpicture_region_t;
 typedef struct image_handler_t image_handler_t;
 
 /* Stream output */
-typedef struct sout_stream_t sout_instance_t;
-
 typedef struct sout_input_t sout_input_t;
 typedef struct sout_packetizer_input_t sout_packetizer_input_t;
 

src/input/decoder.c

@@ -75,7 +75,7 @@ struct vlc_input_decoder_t
     ssize_t          i_spu_channel;
     int64_t          i_spu_order;
 
-    sout_instance_t         *p_sout;
+    sout_stream_t           *p_sout;
     sout_packetizer_input_t *p_sout_input;
 
     vlc_thread_t     thread;
@@ -1771,7 +1771,7 @@ static const struct decoder_owner_callbacks dec_spu_cbs =
 static vlc_input_decoder_t *
 CreateDecoder( vlc_object_t *p_parent,
                const es_format_t *fmt, vlc_clock_t *p_clock,
-               input_resource_t *p_resource, sout_instance_t *p_sout,
+               input_resource_t *p_resource, sout_stream_t *p_sout,
                bool b_thumbnailing, const struct vlc_input_decoder_callbacks *cbs,
                void *cbs_userdata )
 {
@@ -2030,7 +2030,7 @@ static void DecoderUnsupportedCodec( decoder_t *p_dec, const es_format_t *fmt, b
 static vlc_input_decoder_t *
 decoder_New( vlc_object_t *p_parent, const es_format_t *fmt,
              vlc_clock_t *p_clock, input_resource_t *p_resource,
-             sout_instance_t *p_sout, bool thumbnailing,
+             sout_stream_t *p_sout, bool thumbnailing,
              const struct vlc_input_decoder_callbacks *cbs, void *userdata)
 {
     const char *psz_type = p_sout ? N_("packetizer") : N_("decoder");
@@ -2103,7 +2103,7 @@ decoder_New( vlc_object_t *p_parent, const es_format_t *fmt,
 vlc_input_decoder_t *
 vlc_input_decoder_New( vlc_object_t *parent, es_format_t *fmt,
                   vlc_clock_t *p_clock, input_resource_t *resource,
-                  sout_instance_t *p_sout, bool thumbnailing,
+                  sout_stream_t *p_sout, bool thumbnailing,
                   const struct vlc_input_decoder_callbacks *cbs,
                   void *cbs_userdata)
 {

src/input/decoder.h

@@ -52,7 +52,7 @@ struct vlc_input_decoder_callbacks {
 
 vlc_input_decoder_t *
 vlc_input_decoder_New( vlc_object_t *parent, es_format_t *, vlc_clock_t *,
-                       input_resource_t *, sout_instance_t *, bool thumbnailing,
+                       input_resource_t *, sout_stream_t *, bool thumbnailing,
                        const struct vlc_input_decoder_callbacks *cbs,
                        void *userdata ) VLC_USED;
 

src/input/es_out.c

@@ -223,7 +223,7 @@ typedef struct
     vlc_tick_t  i_buffering_extra_system;
 
     /* Record */
-    sout_instance_t *p_sout_record;
+    sout_stream_t *p_sout_record;
 
     /* Used only to limit debugging output */
     int         i_prev_stream_level;

src/input/input_internal.h

@@ -491,7 +491,7 @@ typedef struct input_thread_private_t
 
     /* Output */
     bool            b_out_pace_control; /* XXX Move it ot es_sout ? */
-    sout_instance_t *p_sout;            /* Idem ? */
+    sout_stream_t   *p_sout;            /* Idem ? */
     es_out_t        *p_es_out;
     es_out_t        *p_es_out_display;
     vlc_viewpoint_t viewpoint;

src/input/resource.c

@@ -66,7 +66,7 @@ struct input_resource_t
     /* */
     input_thread_t *p_input;
 
-    sout_instance_t *p_sout;
+    sout_stream_t *p_sout;
     char *psz_sout;
     vout_thread_t   *p_vout_dummy;
     struct vout_resource *vout_rsc_free;
@@ -573,9 +573,9 @@ void input_resource_StopFreeVout(input_resource_t *p_resource)
 }
 
 /* */
-sout_instance_t *input_resource_RequestSout( input_resource_t *p_resource, const char *psz_sout )
+sout_stream_t *input_resource_RequestSout( input_resource_t *p_resource, const char *psz_sout )
 {
-    sout_instance_t *sout;
+    sout_stream_t *sout;
 
     assert(psz_sout != NULL);
     vlc_mutex_lock( &p_resource->lock );
@@ -612,7 +612,7 @@ sout_instance_t *input_resource_RequestSout( input_resource_t *p_resource, const
     return sout;
 }
 
-void input_resource_PutSout(input_resource_t *resource, sout_instance_t *sout)
+void input_resource_PutSout(input_resource_t *resource, sout_stream_t *sout)
 {
     if (sout == NULL)
     {

src/input/resource.h

@@ -35,8 +35,8 @@ void input_resource_SetInput( input_resource_t *, input_thread_t * );
 /**
  * This function handles sout request.
  */
-sout_instance_t *input_resource_RequestSout( input_resource_t *, const char * );
-void input_resource_PutSout(input_resource_t *, sout_instance_t *);
+sout_stream_t *input_resource_RequestSout( input_resource_t *, const char * );
+void input_resource_PutSout(input_resource_t *, sout_stream_t *);
 
 vout_thread_t *input_resource_RequestVout(input_resource_t *, vlc_video_context *,
                                          const vout_configuration_t *,

src/stream_output/stream_output.c

@@ -77,9 +77,9 @@ static void mrl_Clean( mrl_t *p_mrl );
 /*****************************************************************************
  * sout_NewInstance: creates a new stream output instance
  *****************************************************************************/
-sout_instance_t *sout_NewInstance( vlc_object_t *p_parent, const char *psz_dest )
+sout_stream_t *sout_NewInstance( vlc_object_t *p_parent, const char *psz_dest )
 {
-    sout_instance_t *p_sout;
+    sout_stream_t *p_sout;
     char *psz_chain;
 
     assert( psz_dest != NULL );
@@ -109,12 +109,12 @@ sout_instance_t *sout_NewInstance( vlc_object_t *p_parent, const char *psz_dest
 /*****************************************************************************
  * sout_DeleteInstance: delete a previously allocated instance
  *****************************************************************************/
-void sout_DeleteInstance( sout_instance_t * p_sout )
+void sout_DeleteInstance( sout_stream_t * p_sout )
 {
     sout_StreamChainDelete( p_sout, NULL );
 }
 
-bool sout_instance_ControlsPace( sout_instance_t *sout )
+bool sout_instance_ControlsPace( sout_stream_t *sout )
 {
     return !sout_StreamIsSynchronous(sout);
 }
@@ -129,7 +129,7 @@ struct sout_packetizer_input_t
     bool                 b_flushed;
 };
 
-sout_packetizer_input_t *sout_InputNew( sout_instance_t *p_sout,
+sout_packetizer_input_t *sout_InputNew( sout_stream_t *p_sout,
                                         const es_format_t *p_fmt )
 {
     sout_packetizer_input_t *p_input;
@@ -159,7 +159,7 @@ sout_packetizer_input_t *sout_InputNew( sout_instance_t *p_sout,
 /*****************************************************************************
  *
  *****************************************************************************/
-int sout_InputDelete( sout_instance_t *p_sout,
+int sout_InputDelete( sout_stream_t *p_sout,
                       sout_packetizer_input_t *p_input )
 {
 
@@ -171,7 +171,7 @@ int sout_InputDelete( sout_instance_t *p_sout,
     return( VLC_SUCCESS);
 }
 
-static int sout_InputControlVa( sout_instance_t *p_sout,
+static int sout_InputControlVa( sout_stream_t *p_sout,
                                 sout_packetizer_input_t *p_input,
                                 int i_query, va_list args )
 {
@@ -183,7 +183,7 @@ static int sout_InputControlVa( sout_instance_t *p_sout,
     return VLC_EGENERIC;
 }
 
-int sout_InputControl( sout_instance_t *p_sout,
+int sout_InputControl( sout_stream_t *p_sout,
                        sout_packetizer_input_t *p_input, int i_query, ... )
 {
     va_list args;
@@ -195,7 +195,7 @@ int sout_InputControl( sout_instance_t *p_sout,
     return i_result;
 }
 
-void sout_InputFlush( sout_instance_t *p_sout,
+void sout_InputFlush( sout_stream_t *p_sout,
                       sout_packetizer_input_t *p_input )
 {
     sout_StreamFlush( p_sout, p_input->id );
@@ -205,7 +205,7 @@ void sout_InputFlush( sout_instance_t *p_sout,
 /*****************************************************************************
  *
  *****************************************************************************/
-int sout_InputSendBuffer( sout_instance_t *p_sout,
+int sout_InputSendBuffer( sout_stream_t *p_sout,
                           sout_packetizer_input_t *p_input,
                           block_t *p_buffer )
 {

src/stream_output/stream_output.h

@@ -30,23 +30,23 @@
 # include <vlc_network.h>
 
 /** Stream output instance */
-sout_instance_t *sout_NewInstance( vlc_object_t *, const char * );
+sout_stream_t *sout_NewInstance( vlc_object_t *, const char * );
 #define sout_NewInstance(a,b) sout_NewInstance(VLC_OBJECT(a),b)
-void sout_DeleteInstance( sout_instance_t * );
+void sout_DeleteInstance( sout_stream_t * );
 
-bool sout_instance_ControlsPace( sout_instance_t *sout );
+bool sout_instance_ControlsPace( sout_stream_t *sout );
 
-sout_packetizer_input_t *sout_InputNew( sout_instance_t *, const es_format_t * );
-int sout_InputDelete( sout_instance_t *, sout_packetizer_input_t * );
-int sout_InputSendBuffer( sout_instance_t *, sout_packetizer_input_t *,
+sout_packetizer_input_t *sout_InputNew( sout_stream_t *, const es_format_t * );
+int sout_InputDelete( sout_stream_t *, sout_packetizer_input_t * );
+int sout_InputSendBuffer( sout_stream_t *, sout_packetizer_input_t *,
                           block_t * );
 
 enum sout_input_query_e
 {
     SOUT_INPUT_SET_SPU_HIGHLIGHT, /* arg1=const vlc_spu_highlight_t *, can fail */
 };
-int  sout_InputControl( sout_instance_t *, sout_packetizer_input_t *,
+int  sout_InputControl( sout_stream_t *, sout_packetizer_input_t *,
                         int i_query, ... );
-void sout_InputFlush( sout_instance_t *, sout_packetizer_input_t * );
+void sout_InputFlush( sout_stream_t *, sout_packetizer_input_t * );
 
 #endif