Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
fcec9fa7
Commit
fcec9fa7
authored
Aug 28, 2015
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add vout sub-text-scale variable
For cross renderers spu text sizing
parent
7000d76f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
3 deletions
+12
-3
src/libvlc-module.c
src/libvlc-module.c
+6
-0
src/video_output/video_output.c
src/video_output/video_output.c
+3
-3
src/video_output/vout_intf.c
src/video_output/vout_intf.c
+3
-0
No files found.
src/libvlc-module.c
View file @
fcec9fa7
...
@@ -694,6 +694,9 @@ static const char *const ppsz_prefres[] = {
...
@@ -694,6 +694,9 @@ static const char *const ppsz_prefres[] = {
"You can use this option to place the subtitles under the movie, " \
"You can use this option to place the subtitles under the movie, " \
"instead of over the movie. Try several positions.")
"instead of over the movie. Try several positions.")
#define SUB_TEXT_SCALE_TEXT N_("Subtitles text scaling factor")
#define SUB_TEXT_SCALE_LONGTEXT N_("Set value to alter subtitles size where possible")
#define SPU_TEXT N_("Enable sub-pictures")
#define SPU_TEXT N_("Enable sub-pictures")
#define SPU_LONGTEXT N_( \
#define SPU_LONGTEXT N_( \
"You can completely disable the sub-picture processing.")
"You can completely disable the sub-picture processing.")
...
@@ -1625,6 +1628,9 @@ vlc_module_begin ()
...
@@ -1625,6 +1628,9 @@ vlc_module_begin ()
SUB_PATH_TEXT
,
SUB_PATH_LONGTEXT
,
true
)
SUB_PATH_TEXT
,
SUB_PATH_LONGTEXT
,
true
)
add_integer
(
"sub-margin"
,
0
,
SUB_MARGIN_TEXT
,
add_integer
(
"sub-margin"
,
0
,
SUB_MARGIN_TEXT
,
SUB_MARGIN_LONGTEXT
,
true
)
SUB_MARGIN_LONGTEXT
,
true
)
add_integer_with_range
(
"sub-text-scale"
,
100
,
10
,
500
,
SUB_TEXT_SCALE_TEXT
,
SUB_TEXT_SCALE_LONGTEXT
,
false
)
change_volatile
()
set_section
(
N_
(
"Overlays"
)
,
NULL
)
set_section
(
N_
(
"Overlays"
)
,
NULL
)
add_module_list
(
"sub-source"
,
"sub source"
,
NULL
,
add_module_list
(
"sub-source"
,
"sub source"
,
NULL
,
SUB_SOURCE_TEXT
,
SUB_SOURCE_LONGTEXT
,
false
)
SUB_SOURCE_TEXT
,
SUB_SOURCE_LONGTEXT
,
false
)
...
...
src/video_output/video_output.c
View file @
fcec9fa7
...
@@ -144,12 +144,12 @@ static vout_thread_t *VoutCreate(vlc_object_t *object,
...
@@ -144,12 +144,12 @@ static vout_thread_t *VoutCreate(vlc_object_t *object,
vlc_mutex_init
(
&
vout
->
p
->
filter
.
lock
);
vlc_mutex_init
(
&
vout
->
p
->
filter
.
lock
);
vlc_mutex_init
(
&
vout
->
p
->
spu_lock
);
vlc_mutex_init
(
&
vout
->
p
->
spu_lock
);
/* Initialize subpicture unit */
vout
->
p
->
spu
=
spu_Create
(
vout
);
/* Take care of some "interface/control" related initialisations */
/* Take care of some "interface/control" related initialisations */
vout_IntfInit
(
vout
);
vout_IntfInit
(
vout
);
/* Initialize subpicture unit */
vout
->
p
->
spu
=
spu_Create
(
vout
);
vout
->
p
->
title
.
show
=
var_InheritBool
(
vout
,
"video-title-show"
);
vout
->
p
->
title
.
show
=
var_InheritBool
(
vout
,
"video-title-show"
);
vout
->
p
->
title
.
timeout
=
var_InheritInteger
(
vout
,
"video-title-timeout"
);
vout
->
p
->
title
.
timeout
=
var_InheritInteger
(
vout
,
"video-title-timeout"
);
vout
->
p
->
title
.
position
=
var_InheritInteger
(
vout
,
"video-title-position"
);
vout
->
p
->
title
.
position
=
var_InheritInteger
(
vout
,
"video-title-position"
);
...
...
src/video_output/vout_intf.c
View file @
fcec9fa7
...
@@ -293,6 +293,9 @@ void vout_IntfInit( vout_thread_t *p_vout )
...
@@ -293,6 +293,9 @@ void vout_IntfInit( vout_thread_t *p_vout )
VLC_VAR_INTEGER
|
VLC_VAR_DOINHERIT
|
VLC_VAR_ISCOMMAND
);
VLC_VAR_INTEGER
|
VLC_VAR_DOINHERIT
|
VLC_VAR_ISCOMMAND
);
var_AddCallback
(
p_vout
,
"sub-margin"
,
SubMarginCallback
,
NULL
);
var_AddCallback
(
p_vout
,
"sub-margin"
,
SubMarginCallback
,
NULL
);
var_Create
(
p_vout
,
"sub-text-scale"
,
VLC_VAR_INTEGER
|
VLC_VAR_DOINHERIT
|
VLC_VAR_ISCOMMAND
);
/* Mouse coordinates */
/* Mouse coordinates */
var_Create
(
p_vout
,
"mouse-button-down"
,
VLC_VAR_INTEGER
);
var_Create
(
p_vout
,
"mouse-button-down"
,
VLC_VAR_INTEGER
);
var_Create
(
p_vout
,
"mouse-moved"
,
VLC_VAR_COORDS
);
var_Create
(
p_vout
,
"mouse-moved"
,
VLC_VAR_COORDS
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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