Commit 477ffed0 authored by gbazin's avatar gbazin

* src/*, modules/gui/wxwindows/*: audio/video/sub-filter config options are...

* src/*, modules/gui/wxwindows/*: audio/video/sub-filter config options are now a colon (':') separated list of filters to keep the same syntax as the stream output.
parent 13d3b7ec
......@@ -1064,7 +1064,7 @@ static void ChangeVFiltersString( intf_thread_t *p_intf,
if( !psz_parser )
{
psz_parser = psz_string;
asprintf( &psz_string, (*psz_string) ? "%s,%s" : "%s%s",
asprintf( &psz_string, (*psz_string) ? "%s:%s" : "%s%s",
psz_string, psz_name );
free( psz_parser );
}
......@@ -1078,11 +1078,11 @@ static void ChangeVFiltersString( intf_thread_t *p_intf,
if( psz_parser )
{
memmove( psz_parser, psz_parser + strlen(psz_name) +
(*(psz_parser + strlen(psz_name)) == ',' ? 1 : 0 ),
(*(psz_parser + strlen(psz_name)) == ':' ? 1 : 0 ),
strlen(psz_parser + strlen(psz_name)) + 1 );
/* Remove trailing : : */
if( *(psz_string+strlen(psz_string ) -1 ) == ',' )
if( *(psz_string+strlen(psz_string ) -1 ) == ':' )
{
*(psz_string+strlen(psz_string ) -1 ) = '\0';
}
......@@ -1133,7 +1133,7 @@ static void ChangeFiltersString( intf_thread_t *p_intf,
if( !psz_parser )
{
psz_parser = psz_string;
asprintf( &psz_string, (*psz_string) ? "%s,%s" : "%s%s",
asprintf( &psz_string, (*psz_string) ? "%s:%s" : "%s%s",
psz_string, psz_name );
free( psz_parser );
}
......@@ -1147,10 +1147,10 @@ static void ChangeFiltersString( intf_thread_t *p_intf,
if( psz_parser )
{
memmove( psz_parser, psz_parser + strlen(psz_name) +
(*(psz_parser + strlen(psz_name)) == ',' ? 1 : 0 ),
(*(psz_parser + strlen(psz_name)) == ':' ? 1 : 0 ),
strlen(psz_parser + strlen(psz_name)) + 1 );
if( *(psz_string+strlen(psz_string ) -1 ) == ',' )
if( *(psz_string+strlen(psz_string ) -1 ) == ':' )
{
*(psz_string+strlen(psz_string ) -1 ) = '\0';
}
......
......@@ -465,12 +465,12 @@ void ModuleListCatConfigControl::OnUpdate( wxCommandEvent &event )
if( b_waschecked )
{
/* Maybe not the clest solution */
if( ! newtext.Replace(wxString(wxT(","))
if( ! newtext.Replace(wxString(wxT(":"))
+wxU(pp_checkboxes[i]->psz_module),
wxT("")))
{
if( ! newtext.Replace(wxString(wxU(pp_checkboxes[i]->psz_module))
+ wxT(","),wxT("")))
+ wxT(":"),wxT("")))
{
newtext.Replace(wxU(pp_checkboxes[i]->psz_module),wxU(""));
}
......@@ -484,7 +484,7 @@ void ModuleListCatConfigControl::OnUpdate( wxCommandEvent &event )
}
else
{
newtext += wxU( "," );
newtext += wxU( ":" );
newtext += wxU(pp_checkboxes[i]->psz_module);
}
}
......
......@@ -190,7 +190,7 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input )
{
psz_filters = (char *)realloc( psz_filters, strlen( psz_filters ) +
strlen( psz_visual ) + 1);
sprintf( psz_filters, "%s,%s", psz_filters, psz_visual );
sprintf( psz_filters, "%s:%s", psz_filters, psz_visual );
}
else if( psz_visual && *psz_visual )
{
......@@ -212,11 +212,11 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input )
break;
}
while( *psz_parser == ' ' && *psz_parser == ',' )
while( *psz_parser == ' ' && *psz_parser == ':' )
{
psz_parser++;
}
if( ( psz_next = strchr( psz_parser , ',' ) ) )
if( ( psz_next = strchr( psz_parser , ':' ) ) )
{
*psz_next++ = '\0';
}
......@@ -589,7 +589,7 @@ static int ChangeFiltersString( aout_instance_t * p_aout,
if( !psz_parser )
{
psz_parser = val.psz_string;
asprintf( &val.psz_string, (*val.psz_string) ? "%s,%s" : "%s%s",
asprintf( &val.psz_string, (*val.psz_string) ? "%s:%s" : "%s%s",
val.psz_string, psz_name );
free( psz_parser );
}
......@@ -603,7 +603,7 @@ static int ChangeFiltersString( aout_instance_t * p_aout,
if( psz_parser )
{
memmove( psz_parser, psz_parser + strlen(psz_name) +
(*(psz_parser + strlen(psz_name)) == ',' ? 1 : 0 ),
(*(psz_parser + strlen(psz_name)) == ':' ? 1 : 0 ),
strlen(psz_parser + strlen(psz_name)) + 1 );
}
else
......
......@@ -363,7 +363,7 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
/* continue the parent's filter chain */
char *psz_end;
psz_end = strchr( ((vout_thread_t *)p_parent)->psz_filter_chain, ',' );
psz_end = strchr( ((vout_thread_t *)p_parent)->psz_filter_chain, ':' );
if( psz_end && *(psz_end+1) )
p_vout->psz_filter_chain = strdup( psz_end+1 );
else p_vout->psz_filter_chain = NULL;
......@@ -382,7 +382,7 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
* colons */
char *psz_end;
psz_end = strchr( p_vout->psz_filter_chain, ',' );
psz_end = strchr( p_vout->psz_filter_chain, ':' );
if( psz_end )
psz_plugin = strndup( p_vout->psz_filter_chain,
psz_end - p_vout->psz_filter_chain );
......@@ -1383,15 +1383,15 @@ static int DeinterlaceCallback( vlc_object_t *p_this, char const *psz_cmd,
if( psz_deinterlace )
{
char *psz_src = psz_deinterlace + sizeof("deinterlace") - 1;
if( psz_src[0] == ',' ) psz_src++;
if( psz_src[0] == ':' ) psz_src++;
memmove( psz_deinterlace, psz_src, strlen(psz_src) + 1 );
}
}
else if( !psz_deinterlace )
{
psz_filter = realloc( psz_filter, strlen( psz_filter ) +
sizeof(",deinterlace") );
if( psz_filter && *psz_filter ) strcat( psz_filter, "," );
sizeof(":deinterlace") );
if( psz_filter && *psz_filter ) strcat( psz_filter, ":" );
strcat( psz_filter, "deinterlace" );
}
......
......@@ -111,8 +111,7 @@ int spu_Init( spu_t *p_spu )
psz_filter = psz_filter_orig = val.psz_string;
while( psz_filter && *psz_filter )
{
char *psz_parser = strchr( psz_filter, ',' );
if( !psz_parser ) psz_parser = strchr( psz_filter, ':' );
char *psz_parser = strchr( psz_filter, ':' );
if( psz_parser ) *psz_parser++ = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment