vlc | branch: master | Laurent Aimar <[email protected]> | Sat Oct 23 23:16:22 2010 +0200| [a5472838627f3598bbb12de2fcfc343cb2a7abde] | committer: Laurent Aimar
Renamed vout-filter in video-splitter. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a5472838627f3598bbb12de2fcfc343cb2a7abde --- modules/gui/qt4/components/extended_panels.cpp | 4 ++-- src/libvlc-module.c | 11 ++++++----- src/playlist/engine.c | 4 ++-- src/video_output/video_output.c | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp index c429d08..ba37b07 100644 --- a/modules/gui/qt4/components/extended_panels.cpp +++ b/modules/gui/qt4/components/extended_panels.cpp @@ -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 ); diff --git a/src/libvlc-module.c b/src/libvlc-module.c index 2aa7288..aa58c53 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -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 diff --git a/src/playlist/engine.c b/src/playlist/engine.c index 7ee856d..7fa6aa3 100644 --- a/src/playlist/engine.c +++ b/src/playlist/engine.c @@ -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 ); diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index dd2574a..a3dadd6 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -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; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
