Commit 8546a7c7 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

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

* Changed video-fiter to vout-filter, because video-filter will in the future be used for new style filters.
parent 2d222d88
...@@ -18,7 +18,7 @@ Core support: ...@@ -18,7 +18,7 @@ Core support:
* Renamed --spu-channel to --sub-track * Renamed --spu-channel to --sub-track
* Renamed --spumargin to --sub-margin * Renamed --spumargin to --sub-margin
* Renamed --audio-channel to --audio-track * 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 ':' Multiple video filters are now seperated by ',' instead of ':'
* Track selection based on preferred language (--sub-language and --audio-language) * Track selection based on preferred language (--sub-language and --audio-language)
* Many bugfixes... * Many bugfixes...
......
...@@ -318,17 +318,17 @@ static void GtkDeinterlaceUpdate( intf_thread_t *p_intf, char *psz_mode ) ...@@ -318,17 +318,17 @@ static void GtkDeinterlaceUpdate( intf_thread_t *p_intf, char *psz_mode )
char *psz_filter; char *psz_filter;
unsigned int i; unsigned int i;
psz_filter = config_GetPsz( p_intf, "video-filter" ); psz_filter = config_GetPsz( p_intf, "vout-filter" );
if( !strcmp( psz_mode, "None" ) ) if( !strcmp( psz_mode, "None" ) )
{ {
config_PutPsz( p_intf, "video-filter", "" ); config_PutPsz( p_intf, "vout-filter", "" );
} }
else else
{ {
if( !psz_filter || !*psz_filter ) if( !psz_filter || !*psz_filter )
{ {
config_PutPsz( p_intf, "video-filter", "deinterlace" ); config_PutPsz( p_intf, "vout-filter", "deinterlace" );
} }
else else
{ {
...@@ -337,7 +337,7 @@ static void GtkDeinterlaceUpdate( intf_thread_t *p_intf, char *psz_mode ) ...@@ -337,7 +337,7 @@ static void GtkDeinterlaceUpdate( intf_thread_t *p_intf, char *psz_mode )
psz_filter = realloc( psz_filter, strlen( psz_filter ) + 20 ); psz_filter = realloc( psz_filter, strlen( psz_filter ) + 20 );
strcat( psz_filter, ",deinterlace" ); strcat( psz_filter, ",deinterlace" );
} }
config_PutPsz( p_intf, "video-filter", psz_filter ); config_PutPsz( p_intf, "vout-filter", psz_filter );
} }
} }
......
...@@ -328,7 +328,7 @@ wxPanel *ExtraPanel::VideoPanel( wxWindow *parent ) ...@@ -328,7 +328,7 @@ wxPanel *ExtraPanel::VideoPanel( wxWindow *parent )
panel_sizer->SetSizeHints( panel ); panel_sizer->SetSizeHints( panel );
/* Write down initial values */ /* 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" ) ) if( psz_filters && strstr( psz_filters, "adjust" ) )
{ {
adjust_check->SetValue( 1 ); adjust_check->SetValue( 1 );
...@@ -985,7 +985,7 @@ static void ChangeVFiltersString( intf_thread_t *p_intf, ...@@ -985,7 +985,7 @@ static void ChangeVFiltersString( intf_thread_t *p_intf,
vout_thread_t *p_vout; vout_thread_t *p_vout;
char *psz_parser, *psz_string; 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(""); if( !psz_string ) psz_string = strdup("");
...@@ -1026,14 +1026,14 @@ static void ChangeVFiltersString( intf_thread_t *p_intf, ...@@ -1026,14 +1026,14 @@ static void ChangeVFiltersString( intf_thread_t *p_intf,
} }
} }
/* Vout is not kept, so put that in the config */ /* 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 */ /* Try to set on the fly */
p_vout = (vout_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT, p_vout = (vout_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT,
FIND_ANYWHERE ); FIND_ANYWHERE );
if( p_vout ) if( p_vout )
{ {
var_SetString( p_vout, "video-filter", psz_string ); var_SetString( p_vout, "vout-filter", psz_string );
vlc_object_release( p_vout ); vlc_object_release( p_vout );
} }
......
...@@ -972,7 +972,7 @@ vlc_module_begin(); ...@@ -972,7 +972,7 @@ vlc_module_begin();
change_short('V'); change_short('V');
set_subcategory( SUBCAT_VIDEO_VFILTER ); 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 ); FILTER_TEXT, FILTER_LONGTEXT, VLC_FALSE );
#if 0 #if 0
......
...@@ -142,11 +142,11 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout, ...@@ -142,11 +142,11 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout,
char *psz_filter_chain; char *psz_filter_chain;
vlc_value_t val; 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. */ * performance reasons. */
if( p_vout->b_filter_change ) 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; psz_filter_chain = val.psz_string;
if( psz_filter_chain && !*psz_filter_chain ) 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 ) ...@@ -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 */ /* Look for the default filter configuration */
var_Create( p_vout, "video-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); var_Create( p_vout, "vout-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
var_Get( p_vout, "video-filter", &val ); var_Get( p_vout, "vout-filter", &val );
p_vout->psz_filter_chain = val.psz_string; p_vout->psz_filter_chain = val.psz_string;
} }
else else
...@@ -429,10 +429,10 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) ...@@ -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_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"); text.psz_string = _("Filters");
var_Change( p_vout, "video-filter", VLC_VAR_SETTEXT, &text, NULL ); var_Change( p_vout, "vout-filter", VLC_VAR_SETTEXT, &text, NULL );
var_AddCallback( p_vout, "video-filter", FilterCallback, NULL ); var_AddCallback( p_vout, "vout-filter", FilterCallback, NULL );
/* Calculate delay created by internal caching */ /* Calculate delay created by internal caching */
p_input_thread = (input_thread_t *)vlc_object_find( p_vout, 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, ...@@ -1372,7 +1372,7 @@ static int DeinterlaceCallback( vlc_object_t *p_this, char const *psz_cmd,
char *psz_mode = newval.psz_string; char *psz_mode = newval.psz_string;
char *psz_filter, *psz_deinterlace = NULL; 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; psz_filter = val.psz_string;
if( psz_filter ) psz_deinterlace = strstr( psz_filter, "deinterlace" ); 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, ...@@ -1410,7 +1410,7 @@ static int DeinterlaceCallback( vlc_object_t *p_this, char const *psz_cmd,
var_Set( p_vout, "intf-change", val ); var_Set( p_vout, "intf-change", val );
val.psz_string = psz_filter; 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 ); if( psz_filter ) free( psz_filter );
return VLC_SUCCESS; return VLC_SUCCESS;
...@@ -1436,8 +1436,9 @@ static int FilterCallback( vlc_object_t *p_this, char const *psz_cmd, ...@@ -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 */ /* Modify input as well because the vout might have to be restarted */
val.psz_string = newval.psz_string; val.psz_string = newval.psz_string;
var_Create( p_input, "video-filter", VLC_VAR_STRING ); var_Create( p_input, "vout-filter", VLC_VAR_STRING );
var_Set( p_input, "video-filter", val );
var_Set( p_input, "vout-filter", val );
/* Now restart current video stream */ /* Now restart current video stream */
var_Get( p_input, "video-es", &val ); var_Get( p_input, "video-es", &val );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment