Changeset e5127326704fa04d68ae39c807e1d5e738a854dc

Timestamp:

18/06/08 11:39:22 (6 months ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1213781962 +0200

git-parent:

[3b8c56cc792ccb1ce15b615ab2dfeeafab07048a]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1213555607 +0200

Message:

Add some video-filter2 effects to wxwidget extrapanel

Files:

• modules/gui/wxwidgets/extrapanel.cpp (modified) (7 diffs)

modules/gui/wxwidgets/extrapanel.cpp

@@ -52 +52 @@
-                                 char *, bool );
-static void ChangeVFiltersString( intf_thread_t *, char *, bool );
-
+
-
-/* IDs for the controls and the menu commands */
@@ -145 +145 @@
-    char *psz_name;
-    char *psz_help;
+    bool  b_vfilter2;
-};
-
-static const struct filter vfilters[] =
-{
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    { NULL, NULL, NULL } /* Do not remove this line */
-};
@@ -994 +997 @@
-    if( vfilters[i_filter].psz_filter  )
-    {
-
-
+
+
+
+
+
+
-    }
-}
@@ -1050 +1057 @@
-}
-
-
-static void ChangeVFiltersString( intf_thread_t *p_intf,
-
+ 
-{
-    vout_thread_t *p_vout;
@@ -1112 +1118 @@
-}
-
-
-
-
-
-
+
+
+
+
-    char *psz_parser, *psz_string;
-
-
-
-
-
-
-
-
-
+
-
-    if( !psz_string ) psz_string = strdup("");
@@ -1154 +1152 @@
-                            strlen(psz_parser + strlen(psz_name)) + 1 );
-
+            /* Remove trailing : : */
-            if( *(psz_string+strlen(psz_string ) -1 ) == ':' )
-            {
@@ -1165 +1164 @@
-         }
-    }
+    /* Vout is not kept, so put that in the config */
+    config_PutPsz( p_intf, "video-filter", psz_string );
+
+    /* Try to set on the fly */
+    p_vout = (vout_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT,
+                                              FIND_ANYWHERE );
+    if( p_vout )
+    {
+        var_SetString( p_vout, "video-filter", psz_string );
+        vlc_object_release( p_vout );
+    }
+    free( psz_string );
+}
+
+
+static void ChangeFiltersString( intf_thread_t *p_intf,
+                                 aout_instance_t * p_aout,
+                                 char *psz_name, bool b_add )
+{
+    char *psz_parser, *psz_string;
+
+    if( p_aout )
+    {
+        psz_string = var_GetNonEmptyString( p_aout, "audio-filter" );
+    }
+    else
+    {
+        psz_string = config_GetPsz( p_intf, "audio-filter" );
+    }
+
+    if( !psz_string ) psz_string = strdup("");
+
+    psz_parser = strstr( psz_string, psz_name );
+
+    if( b_add )
+    {
+        if( !psz_parser )
+        {
+            psz_parser = psz_string;
+            asprintf( &psz_string, (*psz_string) ? "%s:%s" : "%s%s",
+                            psz_string, psz_name );
+            free( psz_parser );
+        }
+        else
+        {
+            return;
+        }
+    }
+    else
+    {
+        if( psz_parser )
+        {
+            memmove( psz_parser, psz_parser + strlen(psz_name) +
+                            (*(psz_parser + strlen(psz_name)) == ':' ? 1 : 0 ),
+                            strlen(psz_parser + strlen(psz_name)) + 1 );
+
+            if( *(psz_string+strlen(psz_string ) -1 ) == ':' )
+            {
+                *(psz_string+strlen(psz_string ) -1 ) = '\0';
+            }
+         }
+         else
+         {
+             free( psz_string );
+             return;
+         }
+    }
-
-    if( p_aout == NULL )