* Renamed --filter to --video-filter for reasons of consistency. Please check functio...

* Added a notice of this to news
* Another request from the forum.

diff --git a/NEWS b/NEWS
index 5b55a17d8e10bfbaf655eb6748ff03086f764c64..c2b119ecf7cb21ae2eb1c105d649eee40dfcd15d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,7 +8,7 @@ Core support:
     - Tree structure
     - Input preparsing (for meta-data)
     - Grouping (by artist, ...) support 
- * Preferences improvements : 
+ * Preferences improvements: 
     - New organization, designed to improve usability
     - New configuration types (list of modules, ...)
  * XML parsers
@@ -18,7 +18,9 @@ Core support:
  * Renamed --spu-channel to --sub-track
  * Renamed --spumargin to --sub-margin
  * Renamed --audio-channel to --audio-track
- * Track selection based on preferred language
+ * Renamed --filter to --video-filter
+   Multiple video filters are now seperated by ',' instead of ':'
+ * Track selection based on preferred language (--sub-language and --audio-language)
  * Many bugfixes...
 
 Input/Demuxers:
@@ -51,12 +53,13 @@ Audio output:
  * Support for 20/24 bits LPCM
 
 Video output:
- * Video snapshot support
- * Image file video output (png or jpg)
+ * Video snapshot support (png or jpg)
+ * Image file video output (png)
  * Motion detection filter (can trigger playlist actions)
  * Improvements to wall video filter
  * Mosaic (picture-in-picture system)
  * Support for font color and opacity
+ * Fixed Mac OS X OpenGL output
 
 Stream output:
  * Muxers
@@ -88,7 +91,7 @@ Windows port:
 BeOS port:
  * Support for single-buffered overlay
 
-Pocket PC port :
+Pocket PC port:
  * Many fixes
  * New interface
  * New video output 
@@ -101,6 +104,7 @@ IE Plugin:
  * Brand new Internet Explorer ActiveX plugin
 
 Translations:
+ The following languages were added
  * Danish
  * Greek
  * Hindi 

diff --git a/TODO b/TODO
index d5a35709c3a81a1e4fb73af2cf97604c3f6604eb..1587c1d82b4ed6409a082a287fb8c48990301339 100644 (file)
--- a/TODO
+++ b/TODO
@@ -27,6 +27,14 @@ Description: cli option for audio-channels
 It's currently not possible to force VLC from stereo to mono mode, or from stereo to reverse stereo or dolby mode. It's one of the few options in VLC that can not yet be forced from Preferences or the commandline.
 Status: Todo
 
+Task
+Difficulty: Hard
+Platform: any
+Urgency: Wishlist
+Description: Java wrapping/bindings
+Allow java apps to use VLC perhaps? Several people have suggested something like this.
+Status: Todo
+
 Task
 Difficulty: Easy
 Platform: win32/macosx

diff --git a/modules/gui/gtk/menu.c b/modules/gui/gtk/menu.c
index 909af850a07311897050ec123fc23909c200f5f7..1b5a745ddefb18c18072e1afdac3ec5fb5fb6f3c 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, "filter" );
+    psz_filter = config_GetPsz( p_intf, "video-filter" );
 
     if( !strcmp( psz_mode, "None" ) )
     {
-        config_PutPsz( p_intf, "filter", "" );
+        config_PutPsz( p_intf, "video-filter", "" );
     }
     else
     {
         if( !psz_filter || !*psz_filter )
         {
-            config_PutPsz( p_intf, "filter", "deinterlace" );
+            config_PutPsz( p_intf, "video-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, "filter", psz_filter );
+            config_PutPsz( p_intf, "video-filter", psz_filter );
         }
     }
 

diff --git a/modules/gui/wxwindows/extrapanel.cpp b/modules/gui/wxwindows/extrapanel.cpp
index 84b9c3299315457b23aa049655b983287e4a7cde..3b639b61d1d9ddd08fa8ef90542d31b888601050 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, "filter" );
+    psz_filters = config_GetPsz( p_intf, "video-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, "filter" );
+    psz_string = config_GetPsz( p_intf, "video-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, "filter", psz_string );
+    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, "filter", psz_string );
+        var_SetString( p_vout, "video-filter", psz_string );
         vlc_object_release( p_vout );
     }
 

diff --git a/src/libvlc.h b/src/libvlc.h
index 1183e77a2f01921d8fdafd95222dafbccbe8e4fd..30e520368dc14ed661c2f41af3777d9c0c331497 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -960,7 +960,7 @@ vlc_module_begin();
         change_short('V');
 
     set_subcategory( SUBCAT_VIDEO_VFILTER );
-    add_module_list_cat( "filter", SUBCAT_VIDEO_VFILTER, NULL, NULL,
+    add_module_list_cat( "video-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 343475d7e943ebb536f671c46ab530df9daa6ab5..ebe87cc70bbfdecb47d98d6c6e71f9edd5a08f53 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 "filter" variable for obvious
+        /* We don't directly check for the "video-filter" variable for obvious
          * performance reasons. */
         if( p_vout->b_filter_change )
         {
-            var_Get( p_vout, "filter", &val );
+            var_Get( p_vout, "video-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, "filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-        var_Get( p_vout, "filter", &val );
+        var_Create( p_vout, "video-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+        var_Get( p_vout, "video-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, "filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+    var_Create( p_vout, "video-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
     text.psz_string = _("Filters");
-    var_Change( p_vout, "filter", VLC_VAR_SETTEXT, &text, NULL );
-    var_AddCallback( p_vout, "filter", FilterCallback, NULL );
+    var_Change( p_vout, "video-filter", VLC_VAR_SETTEXT, &text, NULL );
+    var_AddCallback( p_vout, "video-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, "filter", &val );
+    var_Get( p_vout, "video-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, "filter", val );
+    var_Set( p_vout, "video-filter", val );
     if( psz_filter ) free( psz_filter );
 
     return VLC_SUCCESS;
@@ -1436,8 +1436,8 @@ 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, "filter", VLC_VAR_STRING );
-    var_Set( p_input, "filter", val );
+    var_Create( p_input, "video-filter", VLC_VAR_STRING );
+    var_Set( p_input, "video-filter", val );
 
     /* Now restart current video stream */
     var_Get( p_input, "video-es", &val );