Changeset c3a1a3712f639eff527d030d129734934aa8b919

Timestamp:

09/14/06 20:58:39 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1158260319 +0000

git-parent:

[aa742bd48e7338574e1beaad5ac63fb078794dc0]

git-author:

Clément Stenac <zorglub@videolan.org> 1158260319 +0000

Message:

Filter handling helpers moved to core
Will have to be updated/factorized when new chain and filter stuff is in.

Files:

• include/audio_output.h (modified) (1 diff)
• include/video_output.h (modified) (1 diff)
• include/vlc_symbols.h (modified) (3 diffs)
• modules/gui/qt4/dialogs/playlist.cpp (modified) (1 diff)
• src/audio_output/intf.c (modified) (1 diff)
• src/video_output/vout_intf.c (modified) (1 diff)

include/audio_output.h

@@ -201 +201 @@
-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 */

include/video_output.h

@@ -247 +247 @@
-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,

include/vlc_symbols.h

@@ -535 +535 @@
-    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__)
@@ -1004 +1006 @@
-#  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__)
-/******************************************************************
@@ -1476 +1480 @@
-    ((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; \

modules/gui/qt4/dialogs/playlist.cpp

@@ -125 +125 @@
-                a->setChecked( true );
-            }
-er
+ge
-            SDMapper->setMapping( a, i>=0? p_parser->pp_shortcuts[i] :
-                                            p_parser->psz_object_name );

src/audio_output/intf.c

@@ -462 +462 @@
-    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 );
+}

src/video_output/vout_intf.c

@@ -732 +732 @@
-
-/*****************************************************************************
+ * 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.
- *****************************************************************************/