Commit 2455945c authored by Laurent Aimar's avatar Laurent Aimar

* all: rework of the input.

parent 96f1226f
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <string.h> /* strdup() */ #include <string.h> /* strdup() */
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc/input.h>
#ifdef HAVE_DIRENT_H #ifdef HAVE_DIRENT_H
# include <dirent.h> # include <dirent.h>
...@@ -54,7 +55,7 @@ ...@@ -54,7 +55,7 @@
# include <unistd.h> # include <unistd.h>
#endif #endif
#define HAVE_DYNAMIC_PLUGINS //#define HAVE_DYNAMIC_PLUGINS
#if defined(HAVE_DL_DYLD) #if defined(HAVE_DL_DYLD)
# if defined(HAVE_MACH_O_DYLD_H) # if defined(HAVE_MACH_O_DYLD_H)
# include <mach-o/dyld.h> # include <mach-o/dyld.h>
...@@ -85,12 +86,6 @@ ...@@ -85,12 +86,6 @@
#include "vlc_interface.h" #include "vlc_interface.h"
#include "intf_eject.h" #include "intf_eject.h"
#include "stream_control.h"
#include "input_ext-intf.h"
#include "input_ext-dec.h"
#include "input_ext-plugins.h"
#include "ninput.h"
#include "vlc_playlist.h" #include "vlc_playlist.h"
#include "vlc_video.h" #include "vlc_video.h"
......
...@@ -31,15 +31,12 @@ ...@@ -31,15 +31,12 @@
* Preamble * Preamble
*****************************************************************************/ *****************************************************************************/
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc/input.h>
#ifdef HAVE_STDLIB_H #ifdef HAVE_STDLIB_H
# include <stdlib.h> /* realloc() */ # include <stdlib.h> /* realloc() */
#endif #endif
#include "stream_control.h"
#include "input_ext-intf.h"
#include "input_ext-dec.h"
#include "vlc_video.h" #include "vlc_video.h"
#include "video_output.h" #include "video_output.h"
...@@ -132,6 +129,10 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type ) ...@@ -132,6 +129,10 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
i_size = sizeof(demux_t); i_size = sizeof(demux_t);
psz_type = "demux"; psz_type = "demux";
break; break;
case VLC_OBJECT_STREAM:
i_size = sizeof(stream_t);
psz_type = "stream";
break;
case VLC_OBJECT_ACCESS: case VLC_OBJECT_ACCESS:
i_size = sizeof(access_t); i_size = sizeof(access_t);
psz_type = "access"; psz_type = "access";
......
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