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
b1763920
Commit
b1763920
authored
May 22, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vout: switch spu-elapsed variable to integer time
parent
d39ba9a0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
modules/text_renderer/text_layout.c
modules/text_renderer/text_layout.c
+1
-1
src/video_output/vout_subpictures.c
src/video_output/vout_subpictures.c
+2
-2
No files found.
modules/text_renderer/text_layout.c
View file @
b1763920
...
@@ -248,7 +248,7 @@ static paragraph_t *NewParagraph( filter_t *p_filter,
...
@@ -248,7 +248,7 @@ static paragraph_t *NewParagraph( filter_t *p_filter,
i_size
*
sizeof
(
*
pp_styles
)
);
i_size
*
sizeof
(
*
pp_styles
)
);
if
(
pi_k_dates
)
if
(
pi_k_dates
)
{
{
int64_t
i_elapsed
=
var_Get
Time
(
p_filter
,
"spu-elapsed"
)
/
1000
;
int64_t
i_elapsed
=
var_Get
Integer
(
p_filter
,
"spu-elapsed"
)
/
1000
;
for
(
int
i
=
0
;
i
<
i_size
;
++
i
)
for
(
int
i
=
0
;
i
<
i_size
;
++
i
)
{
{
p_paragraph
->
pi_karaoke_bar
[
i
]
=
pi_k_dates
[
i
]
>=
i_elapsed
;
p_paragraph
->
pi_karaoke_bar
[
i
]
=
pi_k_dates
[
i
]
>=
i_elapsed
;
...
...
src/video_output/vout_subpictures.c
View file @
b1763920
...
@@ -205,7 +205,7 @@ static filter_t *SpuRenderCreateAndLoadText(spu_t *spu)
...
@@ -205,7 +205,7 @@ static filter_t *SpuRenderCreateAndLoadText(spu_t *spu)
text
->
p_module
=
module_need
(
text
,
"text renderer"
,
"$text-renderer"
,
false
);
text
->
p_module
=
module_need
(
text
,
"text renderer"
,
"$text-renderer"
,
false
);
/* Create a few variables used for enhanced text rendering */
/* Create a few variables used for enhanced text rendering */
var_Create
(
text
,
"spu-elapsed"
,
VLC_VAR_
TIME
);
var_Create
(
text
,
"spu-elapsed"
,
VLC_VAR_
INTEGER
);
var_Create
(
text
,
"text-rerender"
,
VLC_VAR_BOOL
);
var_Create
(
text
,
"text-rerender"
,
VLC_VAR_BOOL
);
return
text
;
return
text
;
...
@@ -272,7 +272,7 @@ static void SpuRenderText(spu_t *spu, bool *rerender_text,
...
@@ -272,7 +272,7 @@ static void SpuRenderText(spu_t *spu, bool *rerender_text,
* least show up on screen, but the effect won't change
* least show up on screen, but the effect won't change
* the text over time.
* the text over time.
*/
*/
var_Set
Time
(
text
,
"spu-elapsed"
,
elapsed_time
);
var_Set
Integer
(
text
,
"spu-elapsed"
,
elapsed_time
);
var_SetBool
(
text
,
"text-rerender"
,
false
);
var_SetBool
(
text
,
"text-rerender"
,
false
);
if
(
text
->
pf_render_html
&&
region
->
psz_html
)
if
(
text
->
pf_render_html
&&
region
->
psz_html
)
...
...
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