/*****************************************************************************
* duplicate.c: duplicate stream output module
*****************************************************************************
- * Copyright (C) 2003-2004 VideoLAN
+ * Copyright (C) 2003-2004 the VideoLAN team
* $Id$
*
* Author: Laurent Aimar <fenrir@via.ecp.fr>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* 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
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" );
+ set_category( CAT_SOUT );
+ set_subcategory( SUBCAT_SOUT_STREAM );
set_callbacks( Open, Close );
vlc_module_end();
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:
{
sout_stream_t *p_stream = (sout_stream_t*)p_this;
sout_stream_sys_t *p_sys;
- sout_cfg_t *p_cfg;
+ config_chain_t *p_cfg;
msg_Dbg( p_stream, "creating 'duplicate'" );
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 );
}
/*****************************************************************************
* 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;
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;
/* 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;
if( !strncmp( psz, "no-audio", strlen( "no-audio" ) ) ||
!strncmp( psz, "noaudio", strlen( "noaudio" ) ) )
{
- if( i_cat != 1 )
+ if( i_cat == -1 )
{
i_cat = fmt->i_cat != AUDIO_ES ? 1 : 0;
}
else if( !strncmp( psz, "no-video", strlen( "no-video" ) ) ||
!strncmp( psz, "novideo", strlen( "novideo" ) ) )
{
- if( i_cat != 1 )
+ if( i_cat == -1 )
{
i_cat = fmt->i_cat != VIDEO_ES ? 1 : 0;
}
else if( !strncmp( psz, "no-spu", strlen( "no-spu" ) ) ||
!strncmp( psz, "nospu", strlen( "nospu" ) ) )
{
- if( i_cat != 1 )
+ if( i_cat == -1 )
{
i_cat = fmt->i_cat != SPU_ES ? 1 : 0;
}
}
else if( !strncmp( psz, "audio", strlen( "audio" ) ) )
{
- if( i_cat != 1 )
+ if( i_cat == -1 )
{
i_cat = fmt->i_cat == AUDIO_ES ? 1 : 0;
}
}
else if( !strncmp( psz, "video", strlen( "video" ) ) )
{
- if( i_cat != 1 )
+ if( i_cat == -1 )
{
i_cat = fmt->i_cat == VIDEO_ES ? 1 : 0;
}
}
else if( !strncmp( psz, "spu", strlen( "spu" ) ) )
{
- if( i_cat != 1 )
+ if( i_cat == -1 )
{
i_cat = fmt->i_cat == SPU_ES ? 1 : 0;
}
if( !strcmp( psz, "no-es" ) || !strcmp( psz, "noes" ) )
{
- if( i_es != 1 )
+ if( i_es == -1 )
{
- i_es = !NumInRange( psz_arg, fmt->i_id ) ? 1 : 0;
+ i_es = NumInRange( psz_arg, fmt->i_id ) ? 0 : -1;
}
}
else if( !strcmp( psz, "es" ) )
{
- if( i_es != 1 )
+ if( i_es == -1 )
{
- i_es = NumInRange( psz_arg, fmt->i_id) ? 1 : 0;
+ i_es = NumInRange( psz_arg, fmt->i_id) ? 1 : -1;
}
}
else if( !strcmp( psz, "no-prgm" ) || !strcmp( psz, "noprgm" ) ||
!strcmp( psz, "no-program" ) || !strcmp( psz, "noprogram" ) )
{
- if( fmt->i_group >= 0 && i_prgm != 1 )
+ if( fmt->i_group >= 0 && i_prgm == -1 )
{
- i_prgm = !NumInRange( psz_arg, fmt->i_group ) ? 1 : 0;
+ i_prgm = NumInRange( psz_arg, fmt->i_group ) ? 0 : -1;
}
}
else if( !strcmp( psz, "prgm" ) || !strcmp( psz, "program" ) )
{
- if( fmt->i_group >= 0 && i_prgm != 1 )
+ if( fmt->i_group >= 0 && i_prgm == -1 )
{
- i_prgm = NumInRange( psz_arg, fmt->i_group ) ? 1 : 0;
+ i_prgm = NumInRange( psz_arg, fmt->i_group ) ? 1 : -1;
}
}
}
free( psz_dup );
- if( i_cat == 0 || i_es == 0 || i_prgm == 0 )
+ if( i_cat == 1 || i_es == 1 || i_prgm == 1 )
{
- /* One test failed */
- return VLC_FALSE;
+ return true;
}
- return VLC_TRUE;
+ return false;
}