X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fautodel.c;h=9cc8c4b719b65d702c17b7075cccb6ac0f8e4d7f;hb=31a163942d6682ae31679e6e2be898f9314b2cc0;hp=5e926ef1afd7acdc680fc1a7d87ce74d004ffba7;hpb=83a3429c40533f4ee1317f1237883d5cd4bba688;p=vlc

diff --git a/modules/stream_out/autodel.c b/modules/stream_out/autodel.c
index 5e926ef1af..9cc8c4b719 100644
--- a/modules/stream_out/autodel.c
+++ b/modules/stream_out/autodel.c
@@ -2,7 +2,7 @@
  * autodel.c: monitor mux inputs and automatically add/delete streams
  *****************************************************************************
  * Copyright (C) 2006 the VideoLAN team
- * $Id: autodel.c 12074 2005-08-08 17:18:08Z dionoea $
+ * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -24,11 +24,15 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
-#include <string.h>
 
-#include <vlc/vlc.h>
-#include <vlc/sout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_sout.h>
+#include <vlc_block.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -39,8 +43,8 @@ static void Close   ( vlc_object_t * );
 #define SOUT_CFG_PREFIX "sout-autodel-"
 
 vlc_module_begin();
-    set_shortname( _("Autodel"));
-    set_description( _("Automatically add/delete input streams"));
+    set_shortname( N_("Autodel"));
+    set_description( N_("Automatically add/delete input streams"));
     set_capability( "sout stream", 50 );
     add_shortcut( "autodel" );
     set_callbacks( Open, Close );
@@ -50,10 +54,6 @@ vlc_module_end();
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-static const char *ppsz_sout_options[] = {
-    NULL
-};
-
 static sout_stream_id_t *Add   ( sout_stream_t *, es_format_t * );
 static int               Del   ( sout_stream_t *, sout_stream_id_t * );
 static int               Send  ( sout_stream_t *, sout_stream_id_t *, block_t * );
@@ -63,7 +63,7 @@ struct sout_stream_id_t
     sout_stream_id_t *id;
     es_format_t fmt;
     mtime_t i_last;
-    vlc_bool_t b_error;
+    bool b_error;
 };
 
 struct sout_stream_sys_t
@@ -93,9 +93,6 @@ static int Open( vlc_object_t *p_this )
     p_sys->pp_es = NULL;
     p_sys->i_es_num = 0;
 
-    sout_CfgParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
-                   p_stream->p_cfg );
-
     p_stream->pf_add    = Add;
     p_stream->pf_del    = Del;
     p_stream->pf_send   = Send;
@@ -130,7 +127,7 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
     p_es->fmt = *p_fmt;
     p_es->id = NULL;
     p_es->i_last = 0;
-    p_es->b_error = VLC_FALSE;
+    p_es->b_error = false;
     TAB_APPEND( p_sys->i_es_num, p_sys->pp_es, p_es );
 
     return p_es;
@@ -158,18 +155,18 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *p_es,
     int i;
 
     p_es->i_last = p_buffer->i_dts;
-    if ( p_es->id == NULL && p_es->b_error != VLC_TRUE )
+    if ( p_es->id == NULL && p_es->b_error != true )
     {
         p_es->id = p_sys->p_out->pf_add( p_sys->p_out, &p_es->fmt );
         if ( p_es->id == NULL )
         {
-            p_es->b_error = VLC_TRUE;
+            p_es->b_error = true;
             msg_Err( p_stream, "couldn't create chain for id %d",
                      p_es->fmt.i_id );
         }
     }
 
-    if ( p_es->b_error != VLC_TRUE )
+    if ( p_es->b_error != true )
         p_sys->p_out->pf_send( p_sys->p_out, p_es->id, p_buffer );
     else
         block_ChainRelease( p_buffer );