* Changed video-fiter to vout-filter, because video-filter will in the future be...

diff --git a/NEWS b/NEWS
index c2b119ecf7cb21ae2eb1c105d649eee40dfcd15d..1ea6cdc7bf71f3ec9b1ed0399b1ef554654372e4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -18,7 +18,7 @@ Core support:
  * Renamed --spu-channel to --sub-track
  * Renamed --spumargin to --sub-margin
  * Renamed --audio-channel to --audio-track
- * Renamed --filter to --video-filter
+ * Renamed --filter to --vout-filter
    Multiple video filters are now seperated by ',' instead of ':'
  * Track selection based on preferred language (--sub-language and --audio-language)
  * Many bugfixes...

diff --git a/modules/gui/gtk/menu.c b/modules/gui/gtk/menu.c
index 1b5a745ddefb18c18072e1afdac3ec5fb5fb6f3c..e630a4dee7f5064fdb1383432ab6c32b4530e68c 100644 (file)
--- a/modules/gui/gtk/menu.c
+++ b/modules/gui/gtk/menu.c
@@ -318,17 +318,17 @@ static void GtkDeinterlaceUpdate( intf_thread_t *p_intf, char *psz_mode )
     char *psz_filter;
     unsigned int  i;
 
-    psz_filter = config_GetPsz( p_intf, "video-filter" );
+    psz_filter = config_GetPsz( p_intf, "vout-filter" );
 
     if( !strcmp( psz_mode, "None" ) )
     {
-        config_PutPsz( p_intf, "video-filter", "" );
+        config_PutPsz( p_intf, "vout-filter", "" );
     }
     else
     {
         if( !psz_filter || !*psz_filter )
         {
-            config_PutPsz( p_intf, "video-filter", "deinterlace" );
+            config_PutPsz( p_intf, "vout-filter", "deinterlace" );
         }
         else
         {
@@ -337,7 +337,7 @@ static void GtkDeinterlaceUpdate( intf_thread_t *p_intf, char *psz_mode )
                 psz_filter = realloc( psz_filter, strlen( psz_filter ) + 20 );
                 strcat( psz_filter, ",deinterlace" );
             }
-            config_PutPsz( p_intf, "video-filter", psz_filter );
+            config_PutPsz( p_intf, "vout-filter", psz_filter );
         }
     }
 

diff --git a/modules/gui/wxwindows/extrapanel.cpp b/modules/gui/wxwindows/extrapanel.cpp
index 3b639b61d1d9ddd08fa8ef90542d31b888601050..60b2b3ee025d1ea70e4ec3390b1292e1f1d1b927 100644 (file)
--- a/modules/gui/wxwindows/extrapanel.cpp
+++ b/modules/gui/wxwindows/extrapanel.cpp
@@ -328,7 +328,7 @@ wxPanel *ExtraPanel::VideoPanel( wxWindow *parent )
     panel_sizer->SetSizeHints( panel );
 
     /* Write down initial values */
-    psz_filters = config_GetPsz( p_intf, "video-filter" );
+    psz_filters = config_GetPsz( p_intf, "vout-filter" );
     if( psz_filters && strstr( psz_filters, "adjust" ) )
     {
         adjust_check->SetValue( 1 );
@@ -985,7 +985,7 @@ static void ChangeVFiltersString( intf_thread_t *p_intf,
     vout_thread_t *p_vout;
     char *psz_parser, *psz_string;
 
-    psz_string = config_GetPsz( p_intf, "video-filter" );
+    psz_string = config_GetPsz( p_intf, "vout-filter" );
 
     if( !psz_string ) psz_string = strdup("");
 
@@ -1026,14 +1026,14 @@ static void ChangeVFiltersString( intf_thread_t *p_intf,
          }
     }
     /* Vout is not kept, so put that in the config */
-    config_PutPsz( p_intf, "video-filter", psz_string );
+    config_PutPsz( p_intf, "vout-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 );
+        var_SetString( p_vout, "vout-filter", psz_string );
         vlc_object_release( p_vout );
     }
 

diff --git a/src/libvlc.h b/src/libvlc.h
index a2b449384cc73491858a54836c992241042b0c25..f71ab07bb236013b8318e148e44de56e75cfa521 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -972,7 +972,7 @@ vlc_module_begin();
         change_short('V');
 
     set_subcategory( SUBCAT_VIDEO_VFILTER );
-    add_module_list_cat( "video-filter", SUBCAT_VIDEO_VFILTER, NULL, NULL,
+    add_module_list_cat( "vout-filter", SUBCAT_VIDEO_VFILTER, NULL, NULL,
                 FILTER_TEXT, FILTER_LONGTEXT, VLC_FALSE );
 
 #if 0

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index ebe87cc70bbfdecb47d98d6c6e71f9edd5a08f53..ac977bae7bbd1d7b3a42aef85c2e53e41934fc4c 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -142,11 +142,11 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout,
         char *psz_filter_chain;
         vlc_value_t val;
 
-        /* We don't directly check for the "video-filter" variable for obvious
+        /* We don't directly check for the "vout-filter" variable for obvious
          * performance reasons. */
         if( p_vout->b_filter_change )
         {
-            var_Get( p_vout, "video-filter", &val );
+            var_Get( p_vout, "vout-filter", &val );
             psz_filter_chain = val.psz_string;
 
             if( psz_filter_chain && !*psz_filter_chain )
@@ -352,8 +352,8 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
         }
 
         /* Look for the default filter configuration */
-        var_Create( p_vout, "video-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-        var_Get( p_vout, "video-filter", &val );
+        var_Create( p_vout, "vout-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+        var_Get( p_vout, "vout-filter", &val );
         p_vout->psz_filter_chain = val.psz_string;
     }
     else
@@ -429,10 +429,10 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
     var_AddCallback( p_vout, "deinterlace", DeinterlaceCallback, NULL );
 
 
-    var_Create( p_vout, "video-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+    var_Create( p_vout, "vout-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
     text.psz_string = _("Filters");
-    var_Change( p_vout, "video-filter", VLC_VAR_SETTEXT, &text, NULL );
-    var_AddCallback( p_vout, "video-filter", FilterCallback, NULL );
+    var_Change( p_vout, "vout-filter", VLC_VAR_SETTEXT, &text, NULL );
+    var_AddCallback( p_vout, "vout-filter", FilterCallback, NULL );
 
     /* Calculate delay created by internal caching */
     p_input_thread = (input_thread_t *)vlc_object_find( p_vout,
@@ -1372,7 +1372,7 @@ static int DeinterlaceCallback( vlc_object_t *p_this, char const *psz_cmd,
     char *psz_mode = newval.psz_string;
     char *psz_filter, *psz_deinterlace = NULL;
 
-    var_Get( p_vout, "video-filter", &val );
+    var_Get( p_vout, "vout-filter", &val );
     psz_filter = val.psz_string;
     if( psz_filter ) psz_deinterlace = strstr( psz_filter, "deinterlace" );
 
@@ -1410,7 +1410,7 @@ static int DeinterlaceCallback( vlc_object_t *p_this, char const *psz_cmd,
     var_Set( p_vout, "intf-change", val );
 
     val.psz_string = psz_filter;
-    var_Set( p_vout, "video-filter", val );
+    var_Set( p_vout, "vout-filter", val );
     if( psz_filter ) free( psz_filter );
 
     return VLC_SUCCESS;
@@ -1436,8 +1436,9 @@ static int FilterCallback( vlc_object_t *p_this, char const *psz_cmd,
 
     /* Modify input as well because the vout might have to be restarted */
     val.psz_string = newval.psz_string;
-    var_Create( p_input, "video-filter", VLC_VAR_STRING );
-    var_Set( p_input, "video-filter", val );
+    var_Create( p_input, "vout-filter", VLC_VAR_STRING );
+
+    var_Set( p_input, "vout-filter", val );
 
     /* Now restart current video stream */
     var_Get( p_input, "video-es", &val );