[vlc-devel] commit: Sanitize input headers (pass 3). (Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Mon Oct 13 20:10:03 2008 +0200| [497c80a2f829e6c7158b4839e09ddf09fb18baa8] | committer: Laurent Aimar 

Sanitize input headers (pass 3).

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=497c80a2f829e6c7158b4839e09ddf09fb18baa8
---

 src/Makefile.am            |    1 +
 src/input/access.c         |    4 ++--
 src/input/demux.h          |    2 +-
 src/input/input.c          |    1 +
 src/input/input_internal.h |    9 ---------
 src/input/stream.c         |    1 +
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 058f403..cc7c932 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -306,6 +306,7 @@ SOURCES_libvlc_common = \
 	input/es_out.c \
 	input/input.c \
 	input/meta.c \
+	input/access.h \
 	input/clock.h \
 	input/decoder.h \
 	input/demux.h \
diff --git a/src/input/access.c b/src/input/access.c
index 901500f..6cb3552 100644
--- a/src/input/access.c
+++ b/src/input/access.c
@@ -26,8 +26,9 @@
 #endif
 
 #include <vlc_common.h>
+#include <libvlc.h>
 
-#include "input_internal.h"
+#include "access.h"
 
 /*****************************************************************************
  * access_InternalNew:
@@ -81,7 +82,6 @@ static access_t *access_InternalNew( vlc_object_t *p_obj, const char *psz_access
 
     if( p_access->p_module == NULL )
     {
-        msg_StackAdd( "could not create access" );
         vlc_object_detach( p_access );
         free( p_access->psz_access );
         free( p_access->psz_path );
diff --git a/src/input/demux.h b/src/input/demux.h
index e206e35..c2f1bf5 100644
--- a/src/input/demux.h
+++ b/src/input/demux.h
@@ -29,7 +29,7 @@
 #ifndef _INPUT_DEMUX_H
 #define _INPUT_DEMUX_H 1
 
-#include <vlc_common.h>
+#include <libvlc.h>
 #include <vlc_demux.h>
 
 /* stream_t *s could be null and then it mean a access+demux in one */
diff --git a/src/input/input.c b/src/input/input.c
index 1b00322..bf696f3 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -37,6 +37,7 @@
 
 #include "input_internal.h"
 #include "es_out.h"
+#include "access.h"
 #include "demux.h"
 
 #include <vlc_sout.h>
diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index d81f7a0..915becf 100644
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -372,15 +372,6 @@ 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"
 
-/* Access */
-
-#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 * );
-
 /* Stream */
 /**
  * stream_t definition
diff --git a/src/input/stream.c b/src/input/stream.c
index 62af247..489f616 100644
--- a/src/input/stream.c
+++ b/src/input/stream.c
@@ -35,6 +35,7 @@
 #include <assert.h>
 
 #include "input_internal.h"
+#include "access.h"
 
 #undef STREAM_DEBUG