Sanitize input headers (pass 4).

diff --git a/src/Makefile.am b/src/Makefile.am
index cc7c9322621f2a582c9d1c13adafa7ca1a7aae5c..63cee7a7fe51047b49fa5a33c567109e5672b12d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -311,10 +311,11 @@ SOURCES_libvlc_common = \
        input/decoder.h \
        input/demux.h \
        input/es_out.h \
+       input/stream.h \
        input/input_internal.h \
        input/vlm_internal.h \
        input/stream.c \
-       input/mem_stream.c \
+       input/stream_memory.c \
        input/subtitles.c \
        input/var.c \
        video_output/video_output.c \

diff --git a/src/input/access.c b/src/input/access.c
index 6cb3552bed84035d995028099eea2fb4daecb1f9..b6e4201d4ad66dea2940c41c8db057e74affe7ec 100644 (file)
--- a/src/input/access.c
+++ b/src/input/access.c
@@ -25,10 +25,8 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-#include <libvlc.h>
-
 #include "access.h"
+#include <libvlc.h>
 
 /*****************************************************************************
  * access_InternalNew:

diff --git a/src/input/access.h b/src/input/access.h
new file mode 100644 (file)
index 0000000..51f5429
--- /dev/null
+++ b/src/input/access.h
@@ -0,0 +1,43 @@
+/*****************************************************************************
+ * access.h: Input access functions
+ *****************************************************************************
+ * Copyright (C) 1998-2008 the VideoLAN team
+ * Copyright (C) 2008 Laurent Aimar
+ * $Id$
+ *
+ * Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#if defined(__PLUGIN__) || defined(__BUILTIN__) || !defined(__LIBVLC__)
+# error This header file can only be included from LibVLC.
+#endif
+
+#ifndef _INPUT_ACCESS_H
+#define _INPUT_ACCESS_H 1
+
+#include <vlc_common.h>
+#include <vlc_access.h>
+
+#define access_New( a, b, c, d ) __access_New(VLC_OBJECT(a), b, c, d )
+access_t * __access_New( vlc_object_t *p_obj, const char *psz_access,
+                          const char *psz_demux, const char *psz_path );
+access_t * access_FilterNew( access_t *p_source,
+                              const char *psz_access_filter );
+void access_Delete( access_t * );
+
+#endif
+

diff --git a/src/input/demux.c b/src/input/demux.c
index 31484f3c0f80074e52760d7c1f63972784abbfce..89264a6533e0b758b20f38c30493062ca6fa0d8e 100644 (file)
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -25,11 +25,9 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-#include <vlc_codec.h>
-
-#include "input_internal.h"
 #include "demux.h"
+#include <libvlc.h>
+#include <vlc_codec.h>
 
 static bool SkipID3Tag( demux_t * );
 static bool SkipAPETag( demux_t *p_demux );

diff --git a/src/input/demux.h b/src/input/demux.h
index c2f1bf56e1ac7d4d5c787eaed79e4710d1f6ce13..77ea695d93f50b596d0af8e6bdf6bd94d28acec7 100644 (file)
--- a/src/input/demux.h
+++ b/src/input/demux.h
@@ -29,9 +29,11 @@
 #ifndef _INPUT_DEMUX_H
 #define _INPUT_DEMUX_H 1
 
-#include <libvlc.h>
+#include <vlc_common.h>
 #include <vlc_demux.h>
 
+#include "stream.h"
+
 /* stream_t *s could be null and then it mean a access+demux in one */
 #define demux_New( a, b, c, d, e, f,g ) __demux_New(VLC_OBJECT(a),b,c,d,e,f,g)
 demux_t *__demux_New(vlc_object_t *p_obj, const char *psz_access, const char *psz_demux, const char *psz_path, stream_t *s, es_out_t *out, bool );

diff --git a/src/input/input.c b/src/input/input.c
index bf696f39ec503cac6c7b57715cebcd884cc926c5..acae8eac67ade17575972d75f02a180dceee5f3d 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -39,6 +39,7 @@
 #include "es_out.h"
 #include "access.h"
 #include "demux.h"
+#include "stream.h"
 
 #include <vlc_sout.h>
 #include "../stream_output/stream_output.h"

diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index 915becf248006ef6393f9a4b882684b1357f1508..878d8f032e0f7c9742b71b2f77fd795f78a5ffba 100644 (file)
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -31,6 +31,7 @@
 #include <vlc_access.h>
 #include <vlc_demux.h>
 #include <vlc_input.h>
+#include <libvlc.h>
 
 /*****************************************************************************
  *  Private input fields
@@ -372,34 +373,4 @@ char *input_CreateFilename( vlc_object_t *p_obj, const char *psz_path, const cha
 
 #define INPUT_RECORD_PREFIX "vlc-record-%Y-%m-%d-%H:%M:%S-$ N-$ p"
 
-/* Stream */
-/**
- * stream_t definition
- */
-struct stream_t
-{
-    VLC_COMMON_MEMBERS
-
-    /*block_t *(*pf_block)  ( stream_t *, int i_size );*/
-    int      (*pf_read)   ( stream_t *, void *p_read, unsigned int i_read );
-    int      (*pf_peek)   ( stream_t *, const uint8_t **pp_peek, unsigned int i_peek );
-    int      (*pf_control)( stream_t *, int i_query, va_list );
-    void     (*pf_destroy)( stream_t *);
-
-    stream_sys_t *p_sys;
-
-    /* UTF-16 and UTF-32 file reading */
-    vlc_iconv_t     conv;
-    int             i_char_width;
-    bool            b_little_endian;
-};
-
-#include <libvlc.h>
-
-static inline stream_t *vlc_stream_create( vlc_object_t *obj )
-{
-    return (stream_t *)vlc_custom_create( obj, sizeof(stream_t),
-                                          VLC_OBJECT_GENERIC, "stream" );
-}
-
 #endif

diff --git a/src/input/stream.c b/src/input/stream.c
index 489f6165b8088722626266d817e13cfbade049cd..c6395e1942cad2224aa9eef3c23c0fc5bb26fff8 100644 (file)
--- a/src/input/stream.c
+++ b/src/input/stream.c
@@ -26,16 +26,19 @@
 #endif
 
 #include <dirent.h>
+#include <assert.h>
 
 #include <vlc_common.h>
 #include <vlc_strings.h>
 #include <vlc_osd.h>
 #include <vlc_charset.h>
 
-#include <assert.h>
+#include <libvlc.h>
 
-#include "input_internal.h"
 #include "access.h"
+#include "stream.h"
+
+#include "input_internal.h"
 
 #undef STREAM_DEBUG
 

diff --git a/src/input/stream.h b/src/input/stream.h
new file mode 100644 (file)
index 0000000..1b8a510
--- /dev/null
+++ b/src/input/stream.h
@@ -0,0 +1,65 @@
+/*****************************************************************************
+ * stream.h: Input stream functions
+ *****************************************************************************
+ * Copyright (C) 1998-2008 the VideoLAN team
+ * Copyright (C) 2008 Laurent Aimar
+ * $Id$
+ *
+ * Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#if defined(__PLUGIN__) || defined(__BUILTIN__) || !defined(__LIBVLC__)
+# error This header file can only be included from LibVLC.
+#endif
+
+#ifndef _INPUT_STREAM_H
+#define _INPUT_STREAM_H 1
+
+#include <vlc_common.h>
+#include <vlc_stream.h>
+
+/**
+ * stream_t definition
+ */
+struct stream_t
+{
+    VLC_COMMON_MEMBERS
+
+    /*block_t *(*pf_block)  ( stream_t *, int i_size );*/
+    int      (*pf_read)   ( stream_t *, void *p_read, unsigned int i_read );
+    int      (*pf_peek)   ( stream_t *, const uint8_t **pp_peek, unsigned int i_peek );
+    int      (*pf_control)( stream_t *, int i_query, va_list );
+    void     (*pf_destroy)( stream_t *);
+
+    stream_sys_t *p_sys;
+
+    /* UTF-16 and UTF-32 file reading */
+    vlc_iconv_t     conv;
+    int             i_char_width;
+    bool            b_little_endian;
+};
+
+#include <libvlc.h>
+
+static inline stream_t *vlc_stream_create( vlc_object_t *obj )
+{
+    return (stream_t *)vlc_custom_create( obj, sizeof(stream_t),
+                                          VLC_OBJECT_GENERIC, "stream" );
+}
+
+#endif
+

diff --git a/src/input/mem_stream.c b/src/input/stream_memory.c
similarity index 96%
rename from src/input/mem_stream.c
rename to src/input/stream_memory.c
index fd38b113d6aad1752abfc5cf17a871c1edc4513a..341f5f6083ff9915c2c29485f043094df02d4a82 100644 (file)
--- a/src/input/mem_stream.c
+++ b/src/input/stream_memory.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
- * mem_stream.c: stream_t wrapper around memory buffer
+ * stream_memory.c: stream_t wrapper around memory buffer
  *****************************************************************************
- * Copyright (C) 1999-2004 the VideoLAN team
+ * Copyright (C) 1999-2008 the VideoLAN team
  * $Id$
  *
  * Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
@@ -25,9 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-
-#include "input_internal.h"
+#include "stream.h"
 
 struct stream_sys_t
 {