Filter handling helpers moved to core

Will have to be updated/factorized when new chain and filter stuff is in.

diff --git a/include/audio_output.h b/include/audio_output.h
index 4eef77635f46e97613819cbd18bf0fedcf39691c..b22567903b2a9ae43260030275082ad035dbf4e3 100644 (file)
--- a/include/audio_output.h
+++ b/include/audio_output.h
@@ -200,5 +200,6 @@ VLC_EXPORT( int, __aout_VolumeMute, ( vlc_object_t *, audio_volume_t * ) );
 VLC_EXPORT( int, aout_Restart, ( aout_instance_t * p_aout ) );
 VLC_EXPORT( int, aout_FindAndRestart, ( vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void * ) );
 VLC_EXPORT( int, aout_ChannelsRestart, ( vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void * ) );
+VLC_EXPORT( void, aout_EnableFilter, (vlc_object_t *, const char *, vlc_bool_t ));
 
 #endif /* _VLC_AUDIO_OUTPUT_H */

diff --git a/include/video_output.h b/include/video_output.h
index 500adeb23907a0a0202407d0e2d6e51613662c74..f3e0d7fbbf909827f583199eb21230690f4e9cf1 100644 (file)
--- a/include/video_output.h
+++ b/include/video_output.h
@@ -246,6 +246,8 @@ VLC_EXPORT( void,   vout_ReleaseWindow, ( vout_thread_t *, void * ) );
 VLC_EXPORT( int, vout_ControlWindow, ( vout_thread_t *, void *, int, va_list ) );
 void vout_IntfInit( vout_thread_t * );
 
+VLC_EXPORT( void, vout_EnableFilter, ( vout_thread_t *, char *,vlc_bool_t , vlc_bool_t  ) );
+
 
 static inline int vout_vaControl( vout_thread_t *p_vout, int i_query,
                                   va_list args )

diff --git a/include/vlc_symbols.h b/include/vlc_symbols.h
index 9866f39042d72a6779da1e0523a82c02e40c5de1..5546bcae134baa0484fd43aa52d36a71259596df 100644 (file)
--- a/include/vlc_symbols.h
+++ b/include/vlc_symbols.h
@@ -534,6 +534,8 @@ struct module_symbols_t
     int (*utf8_fprintf_inner) (FILE *, const char *, ...);
     int (*utf8_vfprintf_inner) (FILE *stream, const char *fmt, va_list ap);
     int (*net_SetDSCP_inner) (int fd, uint8_t dscp);
+    void (*vout_EnableFilter_inner) (vout_thread_t *, char *,vlc_bool_t , vlc_bool_t);
+    void (*aout_EnableFilter_inner) (vlc_object_t *, const char *, vlc_bool_t);
 };
 # if defined (__PLUGIN__)
 #  define aout_FiltersCreatePipeline (p_symbols)->aout_FiltersCreatePipeline_inner
@@ -1003,6 +1005,8 @@ struct module_symbols_t
 #  define utf8_fprintf (p_symbols)->utf8_fprintf_inner
 #  define utf8_vfprintf (p_symbols)->utf8_vfprintf_inner
 #  define net_SetDSCP (p_symbols)->net_SetDSCP_inner
+#  define vout_EnableFilter (p_symbols)->vout_EnableFilter_inner
+#  define aout_EnableFilter (p_symbols)->aout_EnableFilter_inner
 # elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
 /******************************************************************
  * STORE_SYMBOLS: store VLC APIs into p_symbols for plugin access.
@@ -1475,6 +1479,8 @@ struct module_symbols_t
     ((p_symbols)->utf8_fprintf_inner) = utf8_fprintf; \
     ((p_symbols)->utf8_vfprintf_inner) = utf8_vfprintf; \
     ((p_symbols)->net_SetDSCP_inner) = net_SetDSCP; \
+    ((p_symbols)->vout_EnableFilter_inner) = vout_EnableFilter; \
+    ((p_symbols)->aout_EnableFilter_inner) = aout_EnableFilter; \
     (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
     (p_symbols)->__playlist_ItemNew_deprecated = NULL; \
     (p_symbols)->__playlist_ItemCopy_deprecated = NULL; \

diff --git a/modules/gui/qt4/dialogs/playlist.cpp b/modules/gui/qt4/dialogs/playlist.cpp
index 906af51ca8e7cba5c9b20e7254fbe13facea3cda..8f8954505447a728591d85973c6065b5a9d84806 100644 (file)
--- a/modules/gui/qt4/dialogs/playlist.cpp
+++ b/modules/gui/qt4/dialogs/playlist.cpp
@@ -124,7 +124,7 @@ QMenu *PlaylistDialog::SDMenu()
             {
                 a->setChecked( true );
             }
-            CONNECT( a , trigerred(), SDMapper, map() );
+            CONNECT( a , triggered(), SDMapper, map() );
             SDMapper->setMapping( a, i>=0? p_parser->pp_shortcuts[i] :
                                             p_parser->psz_object_name );
             menu->addAction( a );

diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index a80df9f4811d8712e928f227aca3d5f650e3ca20..1a36db4ee313247b63311aa9fe3bfb54b1caf717 100644 (file)
--- a/src/audio_output/intf.c
+++ b/src/audio_output/intf.c
@@ -461,3 +461,71 @@ int aout_ChannelsRestart( vlc_object_t * p_this, const char * psz_variable,
     aout_Restart( p_aout );
     return 0;
 }
+
+/** Enable or disable an audio filter
+ * \param p_this a vlc object
+ * \param psz_name name of the filter
+ * \param b_add are we adding or removing the filter ?
+ */
+void aout_EnableFilter( vlc_object_t *p_this, const char *psz_name,
+                        vlc_bool_t b_add )
+{
+    char *psz_parser, *psz_string;
+    aout_instance_t * p_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT,
+                                                FIND_ANYWHERE );
+
+    if( p_aout )
+        psz_string = var_GetString( p_aout, "audio-filter" );
+    else
+        psz_string = config_GetPsz( p_this, "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
+        {
+            vlc_object_release( p_aout );
+            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 )
+        config_PutPsz( p_this, "audio-filter", psz_string );
+    else
+    {
+        var_SetString( p_aout, "audio-filter", psz_string );
+        for( int i = 0; i < p_aout->i_nb_inputs; i++ )
+            p_aout->pp_inputs[i]->b_restart = VLC_TRUE;
+        vlc_object_release( p_aout );
+    }
+    free( psz_string );
+}

diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index 54d0ac26fa4eee2140b2786f47ad961bc0e27f86..57e15e83490f98fe3b411331b0011b2aae69d753 100644 (file)
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -730,6 +730,59 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
     return VLC_SUCCESS;
 }
 
+/*****************************************************************************
+ * Handle filters
+ *****************************************************************************/
+
+void vout_EnableFilter( vout_thread_t *p_vout, char *psz_name,
+                        vlc_bool_t b_add, vlc_bool_t b_setconfig )
+{
+    char *psz_parser;
+    char *psz_string = config_GetPsz( p_vout, "vout-filter" );
+
+    /* Todo : Use some generic chain manipulation functions */
+    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 );
+
+            /* Remove trailing : : */
+            if( *(psz_string+strlen(psz_string ) -1 ) == ':' )
+            {
+                *(psz_string+strlen(psz_string ) -1 ) = '\0';
+            }
+         }
+         else
+         {
+             free( psz_string );
+             return;
+         }
+    }
+    if( b_setconfig )
+        config_PutPsz( p_vout, "vout-filter", psz_string );
+
+    var_SetString( p_vout, "vout-filter", psz_string );
+    free( psz_string );
+}
+
 /*****************************************************************************
  * vout_ControlDefault: default methods for video output control.
  *****************************************************************************/