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
766ba5cc
Commit
766ba5cc
authored
Apr 17, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stream: add the new controls to demux and memory streams
parent
d8100367
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
14 deletions
+10
-14
src/input/stream_demux.c
src/input/stream_demux.c
+4
-7
src/input/stream_memory.c
src/input/stream_memory.c
+6
-7
No files found.
src/input/stream_demux.c
View file @
766ba5cc
...
@@ -259,7 +259,6 @@ static int DStreamControl( stream_t *s, int i_query, va_list args )
...
@@ -259,7 +259,6 @@ static int DStreamControl( stream_t *s, int i_query, va_list args )
{
{
stream_sys_t
*
p_sys
=
s
->
p_sys
;
stream_sys_t
*
p_sys
=
s
->
p_sys
;
uint64_t
*
p_i64
;
uint64_t
*
p_i64
;
bool
*
p_b
;
switch
(
i_query
)
switch
(
i_query
)
{
{
...
@@ -269,13 +268,10 @@ static int DStreamControl( stream_t *s, int i_query, va_list args )
...
@@ -269,13 +268,10 @@ static int DStreamControl( stream_t *s, int i_query, va_list args )
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
case
STREAM_CAN_SEEK
:
case
STREAM_CAN_SEEK
:
p_b
=
(
bool
*
)
va_arg
(
args
,
bool
*
);
*
p_b
=
false
;
return
VLC_SUCCESS
;
case
STREAM_CAN_FASTSEEK
:
case
STREAM_CAN_FASTSEEK
:
p_b
=
(
bool
*
)
va_arg
(
args
,
bool
*
);
case
STREAM_CAN_PAUSE
:
*
p_b
=
false
;
case
STREAM_CAN_CONTROL_PACE
:
*
va_arg
(
args
,
bool
*
)
=
false
;
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
case
STREAM_GET_POSITION
:
case
STREAM_GET_POSITION
:
...
@@ -302,6 +298,7 @@ static int DStreamControl( stream_t *s, int i_query, va_list args )
...
@@ -302,6 +298,7 @@ static int DStreamControl( stream_t *s, int i_query, va_list args )
case
STREAM_CONTROL_ACCESS
:
case
STREAM_CONTROL_ACCESS
:
case
STREAM_GET_CONTENT_TYPE
:
case
STREAM_GET_CONTENT_TYPE
:
case
STREAM_SET_PAUSE_STATE
:
case
STREAM_SET_RECORD_STATE
:
case
STREAM_SET_RECORD_STATE
:
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
...
...
src/input/stream_memory.c
View file @
766ba5cc
...
@@ -95,7 +95,6 @@ static int Control( stream_t *s, int i_query, va_list args )
...
@@ -95,7 +95,6 @@ static int Control( stream_t *s, int i_query, va_list args )
{
{
stream_sys_t
*
p_sys
=
s
->
p_sys
;
stream_sys_t
*
p_sys
=
s
->
p_sys
;
bool
*
p_bool
;
uint64_t
*
pi_64
,
i_64
;
uint64_t
*
pi_64
,
i_64
;
switch
(
i_query
)
switch
(
i_query
)
...
@@ -106,13 +105,10 @@ static int Control( stream_t *s, int i_query, va_list args )
...
@@ -106,13 +105,10 @@ static int Control( stream_t *s, int i_query, va_list args )
break
;
break
;
case
STREAM_CAN_SEEK
:
case
STREAM_CAN_SEEK
:
p_bool
=
(
bool
*
)
va_arg
(
args
,
bool
*
);
*
p_bool
=
true
;
break
;
case
STREAM_CAN_FASTSEEK
:
case
STREAM_CAN_FASTSEEK
:
p_bool
=
(
bool
*
)
va_arg
(
args
,
bool
*
);
case
STREAM_CAN_PAUSE
:
*
p_bool
=
true
;
case
STREAM_CAN_CONTROL_PACE
:
*
va_arg
(
args
,
bool
*
)
=
true
;
break
;
break
;
case
STREAM_GET_POSITION
:
case
STREAM_GET_POSITION
:
...
@@ -129,6 +125,9 @@ static int Control( stream_t *s, int i_query, va_list args )
...
@@ -129,6 +125,9 @@ static int Control( stream_t *s, int i_query, va_list args )
case
STREAM_GET_CONTENT_TYPE
:
case
STREAM_GET_CONTENT_TYPE
:
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
case
STREAM_SET_PAUSE_STATE
:
break
;
/* nothing to do */
case
STREAM_CONTROL_ACCESS
:
case
STREAM_CONTROL_ACCESS
:
msg_Err
(
s
,
"Hey, what are you thinking ?"
msg_Err
(
s
,
"Hey, what are you thinking ?"
"DON'T USE STREAM_CONTROL_ACCESS !!!"
);
"DON'T USE STREAM_CONTROL_ACCESS !!!"
);
...
...
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