Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
68e3372b
Commit
68e3372b
authored
May 25, 2010
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Used Used vout_control_Push for vout_FlushSubpictureChannel .
parent
b0ffce5e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletion
+12
-1
src/video_output/control.h
src/video_output/control.h
+1
-0
src/video_output/video_output.c
src/video_output/video_output.c
+11
-1
No files found.
src/video_output/control.h
View file @
68e3372b
...
...
@@ -40,6 +40,7 @@ enum {
VOUT_CONTROL_STOP,
#endif
VOUT_CONTROL_SUBPICTURE
,
/* subpicture */
VOUT_CONTROL_FLUSH_SUBPICTURE
,
/* integer */
VOUT_CONTROL_OSD_TITLE
,
/* string */
VOUT_CONTROL_CHANGE_FILTERS
,
/* string */
VOUT_CONTROL_CHANGE_SUB_FILTERS
,
/* string */
...
...
src/video_output/video_output.c
View file @
68e3372b
...
...
@@ -361,7 +361,8 @@ int vout_RegisterSubpictureChannel( vout_thread_t *vout )
}
void
vout_FlushSubpictureChannel
(
vout_thread_t
*
vout
,
int
channel
)
{
spu_ClearChannel
(
vout
->
p
->
p_spu
,
channel
);
vout_control_PushInteger
(
&
vout
->
p
->
control
,
VOUT_CONTROL_FLUSH_SUBPICTURE
,
channel
);
}
/* vout_Control* are usable by anyone at anytime */
...
...
@@ -758,6 +759,12 @@ static void ThreadDisplaySubpicture(vout_thread_t *vout,
{
spu_DisplaySubpicture
(
vout
->
p
->
p_spu
,
subpicture
);
}
static
void
ThreadFlushSubpicture
(
vout_thread_t
*
vout
,
int
channel
)
{
spu_ClearChannel
(
vout
->
p
->
p_spu
,
channel
);
}
static
void
ThreadDisplayOsdTitle
(
vout_thread_t
*
vout
,
const
char
*
string
)
{
if
(
!
vout
->
p
->
title
.
show
)
...
...
@@ -1113,6 +1120,9 @@ static void *Thread(void *object)
ThreadDisplaySubpicture
(
vout
,
cmd
.
u
.
subpicture
);
cmd
.
u
.
subpicture
=
NULL
;
break
;
case
VOUT_CONTROL_FLUSH_SUBPICTURE
:
ThreadFlushSubpicture
(
vout
,
cmd
.
u
.
integer
);
break
;
case
VOUT_CONTROL_OSD_TITLE
:
ThreadDisplayOsdTitle
(
vout
,
cmd
.
u
.
string
);
break
;
...
...
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