* all: rework of the input.

diff --git a/src/misc/modules.c b/src/misc/modules.c
index 37dabf37ebaa86f9ffe85af40c3b64bf9d3e1704..64515383b7086e1dc506a3a24f6132e42466afef 100644 (file)
--- a/src/misc/modules.c
+++ b/src/misc/modules.c
@@ -35,6 +35,7 @@
 #include <string.h>                                              /* strdup() */
 
 #include <vlc/vlc.h>
+#include <vlc/input.h>
 
 #ifdef HAVE_DIRENT_H
 #   include <dirent.h>
@@ -54,7 +55,7 @@
 #   include <unistd.h>
 #endif
 
-#define HAVE_DYNAMIC_PLUGINS
+//#define HAVE_DYNAMIC_PLUGINS
 #if defined(HAVE_DL_DYLD)
 #   if defined(HAVE_MACH_O_DYLD_H)
 #       include <mach-o/dyld.h>
@@ -85,12 +86,6 @@
 #include "vlc_interface.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_video.h"

diff --git a/src/misc/objects.c b/src/misc/objects.c
index 025eab5b3b3a6408ed3e7b8d9e3b1a3087821907..2606b1b15a5c7f7763c7ff84603f738043d610b9 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -31,15 +31,12 @@
  * Preamble
  *****************************************************************************/
 #include <vlc/vlc.h>
+#include <vlc/input.h>
 
 #ifdef HAVE_STDLIB_H
 #   include <stdlib.h>                                          /* realloc() */
 #endif
 
-#include "stream_control.h"
-#include "input_ext-intf.h"
-#include "input_ext-dec.h"
-
 #include "vlc_video.h"
 #include "video_output.h"
 
@@ -132,6 +129,10 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
             i_size = sizeof(demux_t);
             psz_type = "demux";
             break;
+        case VLC_OBJECT_STREAM:
+            i_size = sizeof(stream_t);
+            psz_type = "stream";
+            break;
         case VLC_OBJECT_ACCESS:
             i_size = sizeof(access_t);
             psz_type = "access";