Changeset 477ffed0ec6e787f5fbbc35ebc75fa99b6406877

Timestamp:

11/05/05 17:34:24 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1115825664 +0000

git-parent:

[13d3b7eccc57ceaa09cf4be7b02a718d32ef1f3f]

git-author:

Gildas Bazin <gbazin@videolan.org> 1115825664 +0000

Message:

* 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.

Files:

• modules/gui/wxwindows/extrapanel.cpp (modified) (4 diffs)
• modules/gui/wxwindows/preferences_widgets.cpp (modified) (2 diffs)
• src/audio_output/input.c (modified) (4 diffs)
• src/video_output/video_output.c (modified) (4 diffs)
• src/video_output/vout_subpictures.c (modified) (1 diff)

modules/gui/wxwindows/extrapanel.cpp

@@ -1065 +1065 @@
-        {
-            psz_parser = psz_string;
-,
+:
-                            psz_string, psz_name );
-            free( psz_parser );
@@ -1079 +1079 @@
-        {
-            memmove( psz_parser, psz_parser + strlen(psz_name) +
-,
+:
-                            strlen(psz_parser + strlen(psz_name)) + 1 );
-
-            /* Remove trailing : : */
-,
+:
-            {
-                *(psz_string+strlen(psz_string ) -1 ) = '\0';
@@ -1134 +1134 @@
-        {
-            psz_parser = psz_string;
-,
+:
-                            psz_string, psz_name );
-            free( psz_parser );
@@ -1148 +1148 @@
-        {
-            memmove( psz_parser, psz_parser + strlen(psz_name) +
-,
+:
-                            strlen(psz_parser + strlen(psz_name)) + 1 );
-
-,
+:
-            {
-                *(psz_string+strlen(psz_string ) -1 ) = '\0';

modules/gui/wxwindows/preferences_widgets.cpp

@@ -466 +466 @@
-            {
-                /* Maybe not the clest solution */
-,
+:
-                                      +wxU(pp_checkboxes[i]->psz_module),
-                                      wxT("")))
-                {
-                    if( ! newtext.Replace(wxString(wxU(pp_checkboxes[i]->psz_module))
-,
+:
-            { 
-                        newtext.Replace(wxU(pp_checkboxes[i]->psz_module),wxU(""));
@@ -485 +485 @@
-                else
-                {
-,
+:
-                    newtext += wxU(pp_checkboxes[i]->psz_module);
-                }

src/audio_output/input.c

@@ -191 +191 @@
-        psz_filters = (char *)realloc( psz_filters, strlen( psz_filters ) +
-                                                    strlen( psz_visual )  + 1);
-,
+:
-    }
-    else if(  psz_visual && *psz_visual )
@@ -213 +213 @@
-            }
-
-,
+:
-            {
-                psz_parser++;
-            }
-,
+:
-            {
-                *psz_next++ = '\0';
@@ -590 +590 @@
-        {
-            psz_parser = val.psz_string;
-,
+:
-                      val.psz_string, psz_name );
-            free( psz_parser );
@@ -604 +604 @@
-        {
-            memmove( psz_parser, psz_parser + strlen(psz_name) +
-,
+:
-                     strlen(psz_parser + strlen(psz_name)) + 1 );
-        }

src/video_output/video_output.c

@@ -364 +364 @@
-        char *psz_end;
-
-,
+:
-        if( psz_end && *(psz_end+1) )
-            p_vout->psz_filter_chain = strdup( psz_end+1 );
@@ -383 +383 @@
-        char *psz_end;
-
-,
+:
-        if( psz_end )
-            psz_plugin = strndup( p_vout->psz_filter_chain,
@@ -1384 +1384 @@
-        {
-            char *psz_src = psz_deinterlace + sizeof("deinterlace") - 1;
-,
+:
-            memmove( psz_deinterlace, psz_src, strlen(psz_src) + 1 );
-        }
@@ -1391 +1391 @@
-    {
-        psz_filter = realloc( psz_filter, strlen( psz_filter ) +
-,
-,
+:
+:
-        strcat( psz_filter, "deinterlace" );
-    }

src/video_output/vout_subpictures.c

@@ -112 +112 @@
-    while( psz_filter && *psz_filter )
-    {
-
-
+
-
-        if( psz_parser ) *psz_parser++ = 0;