Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
a5472838
Commit
a5472838
authored
Oct 23, 2010
by
Laurent Aimar
Browse files
Renamed vout-filter in video-splitter.
parent
88937154
Changes
4
Hide whitespace changes
Inline
Side-by-side
modules/gui/qt4/components/extended_panels.cpp
View file @
a5472838
...
...
@@ -287,7 +287,7 @@ void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add )
if
(
module_provides
(
p_obj
,
"video splitter"
)
)
{
psz_filter_type
=
"v
out-fil
ter"
;
psz_filter_type
=
"v
ideo-split
ter"
;
}
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
,
"v
out-fil
ter"
)
)
if
(
!
strcmp
(
psz_filter_type
,
"v
ideo-split
ter"
)
)
{
playlist_t
*
p_playlist
=
pl_Get
(
p_intf
);
var_SetString
(
p_playlist
,
psz_filter_type
,
psz_string
);
...
...
src/libvlc-module.c
View file @
a5472838
...
...
@@ -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 V
OUT_FIL
TER_TEXT N_("Video
output fil
ter module")
#define V
OUT_FIL
TER_LONGTEXT N_( \
"This adds video
output fil
ters like clone or wall" )
#define V
IDEO_SPLIT
TER_TEXT N_("Video
split
ter module")
#define V
IDEO_SPLIT
TER_LONGTEXT N_( \
"This adds video
split
ters 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
...
...
src/playlist/engine.c
View file @
a5472838
...
...
@@ -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
,
"v
out-fil
ter"
,
VLC_VAR_STRING
|
VLC_VAR_DOINHERIT
);
var_AddCallback
(
p_playlist
,
"v
out-fil
ter"
,
VideoSplitterCallback
,
NULL
);
var_Create
(
p_playlist
,
"v
ideo-split
ter"
,
VLC_VAR_STRING
|
VLC_VAR_DOINHERIT
);
var_AddCallback
(
p_playlist
,
"v
ideo-split
ter"
,
VideoSplitterCallback
,
NULL
);
var_AddCallback
(
p_playlist
,
"random"
,
RandomCallback
,
NULL
);
...
...
src/video_output/video_output.c
View file @
a5472838
...
...
@@ -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
,
"v
out-fil
ter"
);
char
*
splitter_name
=
var_InheritString
(
vout
,
"v
ideo-split
ter"
);
if
(
splitter_name
&&
*
splitter_name
)
{
if
(
asprintf
(
&
vout
->
p
->
splitter_name
,
"%s,none"
,
splitter_name
)
<
0
)
vout
->
p
->
splitter_name
=
NULL
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment