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
74a3b3f1
Commit
74a3b3f1
authored
Feb 27, 2013
by
FUJISAWA Tooru
Committed by
Felix Paul Kühne
Feb 27, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
screen: return correct time for DEMUX_GET_TIME
Signed-off-by:
Felix Paul Kühne
<
fkuehne@videolan.org
>
parent
6a4cd277
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
modules/access/screen/screen.c
modules/access/screen/screen.c
+4
-1
modules/access/screen/screen.h
modules/access/screen/screen.h
+2
-0
No files found.
modules/access/screen/screen.c
View file @
74a3b3f1
...
@@ -235,6 +235,8 @@ static int Open( vlc_object_t *p_this )
...
@@ -235,6 +235,8 @@ static int Open( vlc_object_t *p_this )
p_sys
->
es
=
es_out_Add
(
p_demux
->
out
,
&
p_sys
->
fmt
);
p_sys
->
es
=
es_out_Add
(
p_demux
->
out
,
&
p_sys
->
fmt
);
p_sys
->
i_start
=
mdate
();
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
...
@@ -293,6 +295,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
...
@@ -293,6 +295,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
{
{
bool
*
pb
;
bool
*
pb
;
int64_t
*
pi64
;
int64_t
*
pi64
;
demux_sys_t
*
p_sys
=
p_demux
->
p_sys
;
switch
(
i_query
)
switch
(
i_query
)
{
{
...
@@ -313,7 +316,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
...
@@ -313,7 +316,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
case
DEMUX_GET_TIME
:
case
DEMUX_GET_TIME
:
pi64
=
(
int64_t
*
)
va_arg
(
args
,
int64_t
*
);
pi64
=
(
int64_t
*
)
va_arg
(
args
,
int64_t
*
);
*
pi64
=
mdate
();
*
pi64
=
mdate
()
-
p_sys
->
i_start
;
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
/* TODO implement others */
/* TODO implement others */
...
...
modules/access/screen/screen.h
View file @
74a3b3f1
...
@@ -48,6 +48,8 @@ struct demux_sys_t
...
@@ -48,6 +48,8 @@ struct demux_sys_t
mtime_t
i_next_date
;
mtime_t
i_next_date
;
int
i_incr
;
int
i_incr
;
mtime_t
i_start
;
#ifdef SCREEN_SUBSCREEN
#ifdef SCREEN_SUBSCREEN
bool
b_follow_mouse
;
bool
b_follow_mouse
;
unsigned
int
i_screen_height
;
unsigned
int
i_screen_height
;
...
...
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