[vlc-commits] input: use STREAM_SET_PAUSE_STATE (refs #8414)
Rémi Denis-Courmont
git at videolan.org
Tue Apr 16 18:12:50 CEST 2013
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Apr 16 19:06:20 2013 +0300| [902b733bfb326afa5158f2b6c3bf3135ebedb1b1] | committer: Rémi Denis-Courmont
input: use STREAM_SET_PAUSE_STATE (refs #8414)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=902b733bfb326afa5158f2b6c3bf3135ebedb1b1
---
src/input/input.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/input/input.c b/src/input/input.c
index b3f4823..40f230a 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -1593,12 +1593,12 @@ static void ControlPause( input_thread_t *p_input, mtime_t i_control_date )
if( p_input->p->b_can_pause )
{
- if( p_input->p->input.p_access )
- i_ret = access_Control( p_input->p->input.p_access,
- ACCESS_SET_PAUSE_STATE, true );
+ if( p_input->p->input.p_stream != NULL )
+ i_ret = stream_Control( p_input->p->input.p_stream,
+ STREAM_SET_PAUSE_STATE, true );
else
i_ret = demux_Control( p_input->p->input.p_demux,
- DEMUX_SET_PAUSE_STATE, true );
+ DEMUX_SET_PAUSE_STATE, true );
if( i_ret )
{
@@ -1627,12 +1627,12 @@ static void ControlUnpause( input_thread_t *p_input, mtime_t i_control_date )
if( p_input->p->b_can_pause )
{
- if( p_input->p->input.p_access )
- i_ret = access_Control( p_input->p->input.p_access,
- ACCESS_SET_PAUSE_STATE, false );
+ if( p_input->p->input.p_stream )
+ i_ret = stream_Control( p_input->p->input.p_stream,
+ STREAM_SET_PAUSE_STATE, false );
else
i_ret = demux_Control( p_input->p->input.p_demux,
- DEMUX_SET_PAUSE_STATE, false );
+ DEMUX_SET_PAUSE_STATE, false );
if( i_ret )
{
/* FIXME What to do ? */
More information about the vlc-commits
mailing list