* all: rework of the input.

diff --git a/src/interface/interface.c b/src/interface/interface.c
index 3e34e12521e5eed55b22d036b679c70166ff82eb..458431d2da676689339ac177acc991efe239126f 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -37,9 +37,7 @@
 #include <string.h>                                            /* strerror() */
 
 #include <vlc/vlc.h>
-
-#include "stream_control.h"
-#include "input_ext-intf.h"
+#include <vlc/input.h>
 
 #include "audio_output.h"
 

diff --git a/src/libvlc.c b/src/libvlc.c
index 82e38e0a888bd3d12a35f38cec4c650b4641e146..07a5e5f706f3a70b4efdf06a6727760388a31741 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -35,6 +35,7 @@
  * Preamble
  *****************************************************************************/
 #include <vlc/vlc.h>
+#include <vlc/input.h>
 
 #ifdef HAVE_ERRNO_H
 #   include <errno.h>                                              /* ENOMEM */
@@ -66,9 +67,6 @@
 
 #include "vlc_error.h"
 
-#include "stream_control.h"
-#include "input_ext-intf.h"
-
 #include "vlc_playlist.h"
 #include "vlc_interface.h"
 
@@ -1337,7 +1335,7 @@ float VLC_SpeedFaster( int i_object )
     vlc_object_release( p_input );
 
     if( i_object ) vlc_object_release( p_vlc );
-    return val.f_float / DEFAULT_RATE;
+    return val.f_float / INPUT_RATE_DEFAULT;
 }
 
 /**
@@ -1375,7 +1373,7 @@ float VLC_SpeedSlower( int i_object )
     vlc_object_release( p_input );
 
     if( i_object ) vlc_object_release( p_vlc );
-    return val.f_float / DEFAULT_RATE;
+    return val.f_float / INPUT_RATE_DEFAULT;
 }
 
 /**

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 1ab932ebd1094fa014a1c93786ac4d71aa5b062a..bbbefde1016590525630ae8f32cbecee9173fa76 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1376,6 +1376,8 @@ static int DeinterlaceCallback( vlc_object_t *p_this, char const *psz_cmd,
         var_Set( p_input, "deinterlace-mode", val );
     }
 
+    /* FIXME FIXME input2 --fenrir */
+#if 0
     /* now restart all video streams */
     vlc_mutex_lock( &p_input->stream.stream_lock );
 
@@ -1395,6 +1397,7 @@ static int DeinterlaceCallback( vlc_object_t *p_this, char const *psz_cmd,
     vlc_mutex_unlock( &p_input->stream.stream_lock );
 
     vlc_object_release( p_input );
+#endif
 
     val.b_bool = VLC_TRUE;
     var_Set( p_vout, "intf-change", val );
@@ -1417,6 +1420,9 @@ static int FilterCallback( vlc_object_t *p_this, char const *psz_cmd,
         msg_Err( p_vout, "Input not found" );
         return( VLC_EGENERIC );
     }
+
+    /* FIXME FIXME input2 --fenrir */
+#if 0
     /* Restart the video stream */
     vlc_mutex_lock( &p_input->stream.stream_lock );
 
@@ -1436,6 +1442,7 @@ static int FilterCallback( vlc_object_t *p_this, char const *psz_cmd,
     vlc_mutex_unlock( &p_input->stream.stream_lock );
 
     vlc_object_release( p_input );
+#endif
 
     val.b_bool = VLC_TRUE;
     var_Set( p_vout, "intf-change", val );

diff --git a/src/video_output/vout_synchro.c b/src/video_output/vout_synchro.c
index 7035415ff4701df5690274c2d696b9cf2e5357f3..94d396b6fdfb6a8d42d3855e8584e7edde1087aa 100644 (file)
--- a/src/video_output/vout_synchro.c
+++ b/src/video_output/vout_synchro.c
@@ -2,7 +2,7 @@
  * vout_synchro.c : frame dropping routines
  *****************************************************************************
  * Copyright (C) 1999-2004 VideoLAN
- * $Id: vout_synchro.c,v 1.7 2004/01/25 17:16:06 zorglub Exp $
+ * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -99,9 +99,9 @@
 
 #include <vlc/vlc.h>
 #include <vlc/vout.h>
+#include <vlc/input.h>
 
 #include "vout_synchro.h"
-#include "stream_control.h"
 
 /*
  * Local prototypes
@@ -182,7 +182,7 @@ vlc_bool_t vout_SynchroChoose( vout_synchro_t * p_synchro, int i_coding_type,
 
     now = mdate();
     period = 1000000 * 1001 / p_synchro->i_frame_rate
-                     * p_synchro->i_current_rate / DEFAULT_RATE;
+                     * p_synchro->i_current_rate / INPUT_RATE_DEFAULT;
 
     p_synchro->i_render_time = i_render_time;
 
@@ -350,7 +350,7 @@ void vout_SynchroNewPicture( vout_synchro_t * p_synchro, int i_coding_type,
                              mtime_t next_dts, int i_current_rate )
 {
     mtime_t         period = 1000000 * 1001 / p_synchro->i_frame_rate
-                              * i_current_rate / DEFAULT_RATE;
+                              * i_current_rate / INPUT_RATE_DEFAULT;
 #if 0
     mtime_t         now = mdate();
 #endif