* all: rework of the input.

diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c
index ebd0588244515787d873b24d022d7394782369f4..9c5c0da11ae6882787eb4d2fe566df3f78f8c535 100644 (file)
--- a/src/playlist/loadsave.c
+++ b/src/playlist/loadsave.c
@@ -27,14 +27,12 @@
 #include <vlc/vlc.h>
 #include <vlc/vout.h>
 #include <vlc/sout.h>
+#include <vlc/input.h>
 
 #ifdef HAVE_ERRNO_H
 #   include <errno.h>
 #endif
 
-#include "stream_control.h"
-#include "input_ext-intf.h"
-
 #include "vlc_playlist.h"
 
 #define PLAYLIST_FILE_HEADER  "# vlc playlist file version 0.5"

diff --git a/src/playlist/playlist.c b/src/playlist/playlist.c
index 2a34b7eb04b74ce61470319b179eb5cdf6771f6a..b85dc82ddfc66975908790ea490444834388e7ca 100644 (file)
--- a/src/playlist/playlist.c
+++ b/src/playlist/playlist.c
@@ -29,9 +29,6 @@
 #include <vlc/sout.h>
 #include <vlc/input.h>
 
-#include "stream_control.h"
-#include "input_ext-intf.h"
-
 #include "vlc_playlist.h"
 
 #define PLAYLIST_FILE_HEADER_0_5  "# vlc playlist file version 0.5"
@@ -386,7 +383,7 @@ static void RunThread ( playlist_t *p_playlist )
                 }
                 continue;
             }
-            else if( p_playlist->p_input->stream.control.i_status != INIT_S )
+            else if( p_playlist->p_input->i_state != INIT_S )
             {
                 vlc_mutex_unlock( &p_playlist->object_lock );
                 i_vout_destroyed_date =