Skip to content

V
vlc
Commit 96f1226f authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

* all: rework of the input.

parent 51d78b67
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 7 deletions
src/playlist/loadsave.c
View file @ 96f1226f
...@@ -27,14 +27,12 @@ ...@@ -27,14 +27,12 @@
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc/vout.h> #include <vlc/vout.h>
#include <vlc/sout.h> #include <vlc/sout.h>
#include <vlc/input.h>
#ifdef HAVE_ERRNO_H #ifdef HAVE_ERRNO_H
# include <errno.h> # include <errno.h>
#endif #endif
#include "stream_control.h"
#include "input_ext-intf.h"
#include "vlc_playlist.h" #include "vlc_playlist.h"
#define PLAYLIST_FILE_HEADER "# vlc playlist file version 0.5" #define PLAYLIST_FILE_HEADER "# vlc playlist file version 0.5"
......
src/playlist/playlist.c
View file @ 96f1226f
...@@ -29,9 +29,6 @@ ...@@ -29,9 +29,6 @@
#include <vlc/sout.h> #include <vlc/sout.h>
#include <vlc/input.h> #include <vlc/input.h>
#include "stream_control.h"
#include "input_ext-intf.h"
#include "vlc_playlist.h" #include "vlc_playlist.h"
#define PLAYLIST_FILE_HEADER_0_5 "# vlc playlist file version 0.5" #define PLAYLIST_FILE_HEADER_0_5 "# vlc playlist file version 0.5"
...@@ -386,7 +383,7 @@ static void RunThread ( playlist_t *p_playlist ) ...@@ -386,7 +383,7 @@ static void RunThread ( playlist_t *p_playlist )
} }
continue; 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 ); vlc_mutex_unlock( &p_playlist->object_lock );
i_vout_destroyed_date = i_vout_destroyed_date =
......
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