X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fduplicate.c;h=2510be0f39294e7000e43b7cc5c9ec8c52c96bc6;hb=8462c96dd88417db77c726c8ed290ef7f745f873;hp=1eccf44ce9e149f002725efc76a9dd52a008e03d;hpb=62fffadfea2834f7ff57a6ec1b15f8be35e68916;p=vlc

diff --git a/modules/stream_out/duplicate.c b/modules/stream_out/duplicate.c
index 1eccf44ce9..2510be0f39 100644
--- a/modules/stream_out/duplicate.c
+++ b/modules/stream_out/duplicate.c
@@ -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
@@ -37,7 +41,7 @@ static int      Open    ( vlc_object_t * );
 static void     Close   ( vlc_object_t * );
 
 vlc_module_begin();
-    set_description( _("Duplicate stream output") );
+    set_description( N_("Duplicate stream output") );
     set_capability( "sout stream", 50 );
     add_shortcut( "duplicate" );
     add_shortcut( "dup" );
@@ -70,7 +74,7 @@ struct sout_stream_id_t
     void                **pp_ids;
 };
 
-static vlc_bool_t ESSelected( es_format_t *fmt, char *psz_select );
+static bool ESSelected( es_format_t *fmt, char *psz_select );
 
 /*****************************************************************************
  * Open:
@@ -147,19 +151,10 @@ static void Close( vlc_object_t * p_this )
     for( i = 0; i < p_sys->i_nb_streams; i++ )
     {
         sout_StreamDelete( p_sys->pp_streams[i] );
-        if( p_sys->ppsz_select[i] )
-        {
-            free( p_sys->ppsz_select[i] );
-        }
-    }
-    if( p_sys->pp_streams )
-    {
-        free( p_sys->pp_streams );
-    }
-    if( p_sys->ppsz_select )
-    {
-        free( p_sys->ppsz_select );
+        free( p_sys->ppsz_select[i] );
     }
+    free( p_sys->pp_streams );
+    free( p_sys->ppsz_select );
 
     free( p_sys );
 }
@@ -290,7 +285,7 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
 /*****************************************************************************
  * Divers
  *****************************************************************************/
-static vlc_bool_t NumInRange( char *psz_range, int i_num )
+static bool NumInRange( char *psz_range, int i_num )
 {
     char *psz = strchr( psz_range, '-' );
     char *end;
@@ -309,15 +304,15 @@ static vlc_bool_t NumInRange( char *psz_range, int i_num )
         i_start = i_stop = strtol( psz_range, NULL, 0 );
     }
 
-    return i_start <= i_num && i_num <= i_stop ? VLC_TRUE : VLC_FALSE;
+    return i_start <= i_num && i_num <= i_stop ? true : false;
 }
 
-static vlc_bool_t ESSelected( es_format_t *fmt, char *psz_select )
+static bool ESSelected( es_format_t *fmt, char *psz_select )
 {
     char  *psz_dup;
     char  *psz;
 
-    /* We have tree state variable : no tested (-1), failed(0), succeed(1) */
+    /* We have tri-state variable : no tested (-1), failed(0), succeed(1) */
     int i_cat = -1;
     int i_es  = -1;
     int i_prgm= -1;
@@ -325,7 +320,7 @@ static vlc_bool_t ESSelected( es_format_t *fmt, char *psz_select )
     /* If empty all es are selected */
     if( psz_select == NULL || *psz_select == '\0' )
     {
-        return VLC_TRUE;
+        return true;
     }
     psz_dup = strdup( psz_select );
     psz     = psz_dup;
@@ -451,7 +446,7 @@ static vlc_bool_t ESSelected( es_format_t *fmt, char *psz_select )
 
     if( i_cat == 1 || i_es == 1 || i_prgm == 1 )
     {
-        return VLC_TRUE;
+        return true;
     }
-    return VLC_FALSE;
+    return false;
 }