Commit a5472838 authored by Laurent Aimar's avatar Laurent Aimar
Browse files

Renamed vout-filter in video-splitter.

parent 88937154
......@@ -287,7 +287,7 @@ void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add )
if( module_provides( p_obj, "video splitter" ) )
{
psz_filter_type = "vout-filter";
psz_filter_type = "video-splitter";
}
else if( module_provides( p_obj, "video filter2" ) )
{
......@@ -360,7 +360,7 @@ void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add )
config_PutPsz( p_intf, psz_filter_type, psz_string );
/* Try to set on the fly */
if( !strcmp( psz_filter_type, "vout-filter" ) )
if( !strcmp( psz_filter_type, "video-splitter" ) )
{
playlist_t *p_playlist = pl_Get( p_intf );
var_SetString( p_playlist, psz_filter_type, psz_string );
......
......@@ -509,9 +509,9 @@ static const char *const ppsz_pos_descriptions[] =
"VLC can avoid creating window caption, frames, etc... around the video" \
", giving a \"minimal\" window.")
#define VOUT_FILTER_TEXT N_("Video output filter module")
#define VOUT_FILTER_LONGTEXT N_( \
"This adds video output filters like clone or wall" )
#define VIDEO_SPLITTER_TEXT N_("Video splitter module")
#define VIDEO_SPLITTER_LONGTEXT N_( \
"This adds video splitters like clone or wall" )
#define VIDEO_FILTER_TEXT N_("Video filter module")
#define VIDEO_FILTER_LONGTEXT N_( \
......@@ -1778,8 +1778,9 @@ vlc_module_begin ()
set_subcategory( SUBCAT_VIDEO_VFILTER )
add_module_list_cat( "video-filter", SUBCAT_VIDEO_VFILTER, NULL, NULL,
VIDEO_FILTER_TEXT, VIDEO_FILTER_LONGTEXT, false )
add_module_list_cat( "vout-filter", SUBCAT_VIDEO_VFILTER, NULL, NULL,
VOUT_FILTER_TEXT, VOUT_FILTER_LONGTEXT, false )
add_module_list_cat( "video-splitter", SUBCAT_VIDEO_VFILTER, NULL, NULL,
VIDEO_SPLITTER_TEXT, VIDEO_SPLITTER_LONGTEXT, false )
add_deprecated_alias( "vout-filter" )
#if 0
add_string( "pixel-ratio", "1", PIXEL_RATIO_TEXT, PIXEL_RATIO_TEXT )
#endif
......
......@@ -414,8 +414,8 @@ static void VariablesInit( playlist_t *p_playlist )
var_AddCallback( p_playlist, "rate-slower", RateOffsetCallback, NULL );
var_AddCallback( p_playlist, "rate-faster", RateOffsetCallback, NULL );
var_Create( p_playlist, "vout-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
var_AddCallback( p_playlist, "vout-filter", VideoSplitterCallback, NULL );
var_Create( p_playlist, "video-splitter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
var_AddCallback( p_playlist, "video-splitter", VideoSplitterCallback, NULL );
var_AddCallback( p_playlist, "random", RandomCallback, NULL );
......
......@@ -141,7 +141,7 @@ static vout_thread_t *VoutCreate(vlc_object_t *object,
vout->p->title.position = var_GetInteger(vout, "video-title-position");
/* Get splitter name if present */
char *splitter_name = var_InheritString(vout, "vout-filter");
char *splitter_name = var_InheritString(vout, "video-splitter");
if (splitter_name && *splitter_name) {
if (asprintf(&vout->p->splitter_name, "%s,none", splitter_name) < 0)
vout->p->splitter_name = NULL;
......
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