Skip to content

V
vlc
Commit 05c9649a authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

* all: use var_Set/Get "state"/"position"/"rate" instead of old functions.

parent b894e2c5
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 21 deletions
modules/access/dvdplay/demux.c
View file @ 05c9649a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* demux.c: demux functions for dvdplay. * demux.c: demux functions for dvdplay.
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: demux.c,v 1.8 2004/03/03 20:39:51 gbazin Exp $ * $Id$
* *
* Author: Stphane Borel <stef@via.ecp.fr> * Author: Stphane Borel <stef@via.ecp.fr>
* *
...@@ -176,7 +176,7 @@ static int Demux( input_thread_t * p_input ) ...@@ -176,7 +176,7 @@ static int Demux( input_thread_t * p_input )
pgrm_descriptor_t * p_pgrm; pgrm_descriptor_t * p_pgrm;
/* when we receive still_time flag, we have to pause immediately */ /* when we receive still_time flag, we have to pause immediately */
input_SetStatus( p_input, INPUT_STATUS_PAUSE ); var_SetInteger( p_input, "state", PAUSE_S );
dvdIntfStillTime( p_dvd->p_intf, p_dvd->i_still_time ); dvdIntfStillTime( p_dvd->p_intf, p_dvd->i_still_time );
p_dvd->i_still_time = 0; p_dvd->i_still_time = 0;
......
modules/access/dvdplay/intf.c
View file @ 05c9649a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf.c: interface for DVD video manager * intf.c: interface for DVD video manager
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: intf.c,v 1.9 2003/10/29 01:33:27 gbazin Exp $ * $Id$
* *
* Authors: Stphane Borel <stef@via.ecp.fr> * Authors: Stphane Borel <stef@via.ecp.fr>
* *
...@@ -144,8 +144,7 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -144,8 +144,7 @@ static void RunIntf( intf_thread_t *p_intf )
else else
{ {
/* still time elasped */ /* still time elasped */
input_SetStatus( p_intf->p_sys->p_input, var_SetInteger( p_intf->p_sys->p_input, "state", PLAYING_S );
INPUT_STATUS_PLAY );
p_intf->p_sys->m_still_time = 0; p_intf->p_sys->m_still_time = 0;
p_intf->p_sys->b_still = 0; p_intf->p_sys->b_still = 0;
mlast = 0; mlast = 0;
...@@ -163,8 +162,7 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -163,8 +162,7 @@ static void RunIntf( intf_thread_t *p_intf )
} }
if( !p_intf->p_sys->m_still_time ) if( !p_intf->p_sys->m_still_time )
{ {
input_SetStatus( p_intf->p_sys->p_input, var_SetInteger( p_intf->p_sys->p_input, "state", PLAYING_S );
INPUT_STATUS_PLAY );
} }
mlast = mtime; mlast = mtime;
} }
...@@ -207,7 +205,7 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -207,7 +205,7 @@ static void RunIntf( intf_thread_t *p_intf )
if( i_activate && p_intf->p_sys->b_still ) if( i_activate && p_intf->p_sys->b_still )
{ {
input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PLAY ); var_SetInteger( p_intf->p_sys->p_input, "state", PLAYING_S );
p_intf->p_sys->b_still = 0; p_intf->p_sys->b_still = 0;
p_intf->p_sys->b_inf_still = 0; p_intf->p_sys->b_inf_still = 0;
p_intf->p_sys->m_still_time = 0; p_intf->p_sys->m_still_time = 0;
...@@ -268,7 +266,7 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -268,7 +266,7 @@ static void RunIntf( intf_thread_t *p_intf )
if( i_activate && p_intf->p_sys->b_still ) if( i_activate && p_intf->p_sys->b_still )
{ {
input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PLAY ); var_SetInteger( p_intf->p_sys->p_input, "state", PLAYING_S );
p_intf->p_sys->b_still = 0; p_intf->p_sys->b_still = 0;
p_intf->p_sys->b_inf_still = 0; p_intf->p_sys->b_inf_still = 0;
p_intf->p_sys->m_still_time = 0; p_intf->p_sys->m_still_time = 0;
...@@ -441,7 +439,7 @@ int dvdIntfResetStillTime( intf_thread_t *p_intf ) ...@@ -441,7 +439,7 @@ int dvdIntfResetStillTime( intf_thread_t *p_intf )
{ {
vlc_mutex_lock( &p_intf->change_lock ); vlc_mutex_lock( &p_intf->change_lock );
p_intf->p_sys->m_still_time = 0; p_intf->p_sys->m_still_time = 0;
input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PLAY ); var_SetInteger( p_intf->p_sys->p_input, "state", PLAYING_S );
vlc_mutex_unlock( &p_intf->change_lock ); vlc_mutex_unlock( &p_intf->change_lock );
return VLC_SUCCESS; return VLC_SUCCESS;
......
modules/access/vcdx/access.c
View file @ 05c9649a
...@@ -203,7 +203,7 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len ) ...@@ -203,7 +203,7 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
#if 1 #if 1
p_vcd->p_intf->p_sys->b_still = 1; p_vcd->p_intf->p_sys->b_still = 1;
input_SetStatus( p_input, INPUT_STATUS_PAUSE ); var_SetInteger( p_input, "state", PAUSE_S );
#endif #endif
vlc_mutex_lock( &p_input->stream.stream_lock ); vlc_mutex_lock( &p_input->stream.stream_lock );
...@@ -216,7 +216,7 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len ) ...@@ -216,7 +216,7 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
input_ClockManageControl( p_input, p_pgrm, 0 ); input_ClockManageControl( p_input, p_pgrm, 0 );
p_vcd->p_intf->p_sys->b_still = 1; p_vcd->p_intf->p_sys->b_still = 1;
input_SetStatus( p_input, INPUT_STATUS_PAUSE ); var_SetInteger( p_input, "state", PAUSE_S );
return i_read + M2F2_SECTOR_SIZE; return i_read + M2F2_SECTOR_SIZE;
} }
...@@ -564,8 +564,7 @@ VCDPlay( input_thread_t *p_input, vcdinfo_itemid_t itemid ) ...@@ -564,8 +564,7 @@ VCDPlay( input_thread_t *p_input, vcdinfo_itemid_t itemid )
#if 1 #if 1
if ( p_vcd->in_still != b_was_still ) { if ( p_vcd->in_still != b_was_still ) {
if (p_input->stream.pp_selected_es) { if (p_input->stream.pp_selected_es) {
input_SetStatus( p_input, INPUT_STATUS_END ); var_SetInteger( p_input, "state", PLAYING_S );
input_SetStatus( p_input, INPUT_STATUS_PLAY );
} }
} }
#endif #endif
......
modules/access/vcdx/demux.c
View file @ 05c9649a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* demux.c: demux functions for dvdplay. * demux.c: demux functions for dvdplay.
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: demux.c,v 1.4 2004/03/03 20:39:51 gbazin Exp $ * $Id$
* *
* Author: Stphane Borel <stef@via.ecp.fr> * Author: Stphane Borel <stef@via.ecp.fr>
* *
...@@ -178,7 +178,7 @@ static int Demux( input_thread_t * p_input ) ...@@ -178,7 +178,7 @@ static int Demux( input_thread_t * p_input )
pgrm_descriptor_t * p_pgrm; pgrm_descriptor_t * p_pgrm;
/* when we receive still_time flag, we have to pause immediately */ /* when we receive still_time flag, we have to pause immediately */
input_SetStatus( p_input, INPUT_STATUS_PAUSE ); var_SetInteger( p_input, "state", PAUSE_S );
vcdIntfStillTime( p_vcd->p_intf, p_vcd->i_still_time ); vcdIntfStillTime( p_vcd->p_intf, p_vcd->i_still_time );
p_vcd->i_still_time = 0; p_vcd->i_still_time = 0;
......
modules/access/vcdx/intf.c
View file @ 05c9649a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf.c: Video CD interface to handle user interaction and still time * intf.c: Video CD interface to handle user interaction and still time
***************************************************************************** *****************************************************************************
* Copyright (C) 2002,2003 VideoLAN * Copyright (C) 2002,2003 VideoLAN
* $Id: intf.c,v 1.12 2003/12/22 14:32:55 sam Exp $ * $Id$
* *
* Author: Rocky Bernstein <rocky@panix.com> * Author: Rocky Bernstein <rocky@panix.com>
* from DVD code by Stphane Borel <stef@via.ecp.fr> * from DVD code by Stphane Borel <stef@via.ecp.fr>
...@@ -139,8 +139,7 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -139,8 +139,7 @@ static void RunIntf( intf_thread_t *p_intf )
{ {
/* Still time has elasped; set to continue playing. */ /* Still time has elasped; set to continue playing. */
dbg_print(INPUT_DBG_STILL, "wait time done - setting play"); dbg_print(INPUT_DBG_STILL, "wait time done - setting play");
input_SetStatus( p_intf->p_sys->p_input, var_SetInteger( p_intf->p_sys->p_input, "state", PLAYING_S );
INPUT_STATUS_PLAY );
p_intf->p_sys->m_still_time = 0; p_intf->p_sys->m_still_time = 0;
p_intf->p_sys->b_still = 0; p_intf->p_sys->b_still = 0;
mlast = 0; mlast = 0;
...@@ -233,7 +232,7 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -233,7 +232,7 @@ static void RunIntf( intf_thread_t *p_intf )
if( p_intf->p_sys->b_still ) if( p_intf->p_sys->b_still )
{ {
dbg_print(INPUT_DBG_STILL, "Playing still after activate"); dbg_print(INPUT_DBG_STILL, "Playing still after activate");
input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PLAY ); var_SetInteger( p_intf->p_sys->p_input, "state", PLAYING_S );
p_intf->p_sys->b_still = 0; p_intf->p_sys->b_still = 0;
p_intf->p_sys->b_inf_still = 0; p_intf->p_sys->b_inf_still = 0;
p_intf->p_sys->m_still_time = 0; p_intf->p_sys->m_still_time = 0;
...@@ -383,7 +382,7 @@ int vcdIntfResetStillTime( intf_thread_t *p_intf ) ...@@ -383,7 +382,7 @@ int vcdIntfResetStillTime( intf_thread_t *p_intf )
{ {
vlc_mutex_lock( &p_intf->change_lock ); vlc_mutex_lock( &p_intf->change_lock );
p_intf->p_sys->m_still_time = 0; p_intf->p_sys->m_still_time = 0;
input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PLAY ); var_SetInteger( p_intf->p_sys->p_input, "state", PLAYING_S );
vlc_mutex_unlock( &p_intf->change_lock ); vlc_mutex_unlock( &p_intf->change_lock );
return VLC_SUCCESS; return VLC_SUCCESS;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment