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

diff --git a/modules/access/dvdplay/demux.c b/modules/access/dvdplay/demux.c
index 08249bc00bb022333d5355a30678189f6d906c53..19324219dabf11d39746da1a668320458d5cb639 100644 (file)
--- a/modules/access/dvdplay/demux.c
+++ b/modules/access/dvdplay/demux.c
@@ -2,7 +2,7 @@
  * demux.c: demux functions for dvdplay.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: demux.c,v 1.8 2004/03/03 20:39:51 gbazin Exp $
+ * $Id$
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -176,7 +176,7 @@ static int Demux( input_thread_t * p_input )
         pgrm_descriptor_t * p_pgrm;
 
         /* 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 );
         p_dvd->i_still_time = 0;

diff --git a/modules/access/dvdplay/intf.c b/modules/access/dvdplay/intf.c
index 15b1cb4c58ca4fbea336ef8e4baf24b1d9f89be2..fe59a2d1a914f4e6d0b5789dddd0bf25fc1df36f 100644 (file)
--- a/modules/access/dvdplay/intf.c
+++ b/modules/access/dvdplay/intf.c
@@ -2,7 +2,7 @@
  * intf.c: interface for DVD video manager
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: intf.c,v 1.9 2003/10/29 01:33:27 gbazin Exp $
+ * $Id$
  *
  * Authors: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -144,8 +144,7 @@ static void RunIntf( intf_thread_t *p_intf )
             else
             {
                 /* still time elasped */
-                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->m_still_time = 0;
                 p_intf->p_sys->b_still = 0;
                 mlast = 0;
@@ -163,8 +162,7 @@ static void RunIntf( intf_thread_t *p_intf )
                 }
                 if( !p_intf->p_sys->m_still_time )
                 {
-                    input_SetStatus( p_intf->p_sys->p_input,
-                                     INPUT_STATUS_PLAY );
+                    var_SetInteger( p_intf->p_sys->p_input, "state", PLAYING_S );
                 }
                 mlast = mtime;
             }
@@ -207,7 +205,7 @@ static void RunIntf( intf_thread_t *p_intf )
 
             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_inf_still = 0;
                 p_intf->p_sys->m_still_time = 0;
@@ -268,7 +266,7 @@ static void RunIntf( intf_thread_t *p_intf )
                 
                 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_inf_still = 0;
                     p_intf->p_sys->m_still_time = 0;
@@ -441,7 +439,7 @@ int dvdIntfResetStillTime( intf_thread_t *p_intf )
 {
     vlc_mutex_lock( &p_intf->change_lock );
     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 );
 
     return VLC_SUCCESS;

diff --git a/modules/access/vcdx/access.c b/modules/access/vcdx/access.c
index e81d7fbc4a64e15dc2b8752f14e6e7b50c19be83..3da4ae9641153253104a2271457684f5c73b1954 100644 (file)
--- a/modules/access/vcdx/access.c
+++ b/modules/access/vcdx/access.c
@@ -203,7 +203,7 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
 
 #if 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
 
             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 )
             input_ClockManageControl( p_input, p_pgrm, 0 );
 
             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;
           }
@@ -564,8 +564,7 @@ VCDPlay( input_thread_t *p_input, vcdinfo_itemid_t itemid )
 #if 1
     if ( p_vcd->in_still != b_was_still ) {
       if (p_input->stream.pp_selected_es) {
-       input_SetStatus( p_input, INPUT_STATUS_END );
-       input_SetStatus( p_input, INPUT_STATUS_PLAY );
+        var_SetInteger( p_input, "state", PLAYING_S );
       }
     }
 #endif

diff --git a/modules/access/vcdx/demux.c b/modules/access/vcdx/demux.c
index a835fb051388777d2920f40c27038dd64b847bca..cf6dc5bf795f6ae07b0cd192d001b345993cb256 100644 (file)
--- a/modules/access/vcdx/demux.c
+++ b/modules/access/vcdx/demux.c
@@ -2,7 +2,7 @@
  * demux.c: demux functions for dvdplay.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: demux.c,v 1.4 2004/03/03 20:39:51 gbazin Exp $
+ * $Id$
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -178,7 +178,7 @@ static int Demux( input_thread_t * p_input )
         pgrm_descriptor_t * p_pgrm;
 
         /* 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 );
         p_vcd->i_still_time = 0;

diff --git a/modules/access/vcdx/intf.c b/modules/access/vcdx/intf.c
index 573c3fe125ec925d8c0407d0170b1e7f291ab37c..69045cb7fffefd6bfa050a559db9250666ace8bb 100644 (file)
--- a/modules/access/vcdx/intf.c
+++ b/modules/access/vcdx/intf.c
@@ -2,7 +2,7 @@
  * intf.c: Video CD interface to handle user interaction and still time
  *****************************************************************************
  * 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>
  *   from DVD code by Stéphane Borel <stef@via.ecp.fr>
@@ -139,8 +139,7 @@ static void RunIntf( intf_thread_t *p_intf )
             {
                 /* Still time has elasped; set to continue playing. */
                 dbg_print(INPUT_DBG_STILL, "wait time done - setting play");
-                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->m_still_time = 0;
                 p_intf->p_sys->b_still = 0;
                 mlast = 0;
@@ -233,7 +232,7 @@ static void RunIntf( intf_thread_t *p_intf )
             if( p_intf->p_sys->b_still )
               {
                 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_inf_still = 0;
                 p_intf->p_sys->m_still_time = 0;
@@ -383,7 +382,7 @@ int vcdIntfResetStillTime( intf_thread_t *p_intf )
 {
     vlc_mutex_lock( &p_intf->change_lock );
     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 );
 
     return VLC_SUCCESS;