Sanitize input headers (pass 1).

diff --git a/src/Makefile.am b/src/Makefile.am
index afe3101dda239aced73e1cd0991f5b8e5ee27474..0a56eee85ae6b37ac405d3f84148786034dd9dc0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -306,8 +306,9 @@ SOURCES_libvlc_common = \
        input/es_out.c \
        input/input.c \
        input/meta.c \
-       input/input_clock.h \
-       input/input_decoder.h \
+       input/clock.h \
+       input/decoder.h \
+       input/es_out.h \
        input/input_internal.h \
        input/vlm_internal.h \
        input/stream.c \

diff --git a/src/input/clock.c b/src/input/clock.c
index 701945789c53fb64c52e01e2d46d662b608d055f..beee45ef0b9209e82ae7d2ab91d9c97ca318e349 100644 (file)
--- a/src/input/clock.c
+++ b/src/input/clock.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * input_clock.c: Clock/System date convertions, stream management
+ * clock.c: Clock/System date convertions, stream management
  *****************************************************************************
  * Copyright (C) 1999-2008 the VideoLAN team
  * Copyright (C) 2008 Laurent Aimar
@@ -32,7 +32,7 @@
 
 #include <vlc_common.h>
 #include <vlc_input.h>
-#include "input_clock.h"
+#include "clock.h"
 
 /* TODO:
  * - clean up locking once clock code is stable

diff --git a/src/input/input_clock.h b/src/input/clock.h
similarity index 100%
rename from src/input/input_clock.h
rename to src/input/clock.h

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 1306181b13dfc16710240218523fb8d905125a6e..bbc01aa54681e09bde0c906fe013f1eb379b9edb 100644 (file)
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -44,8 +44,8 @@
 #include "audio_output/aout_internal.h"
 #include "stream_output/stream_output.h"
 #include "input_internal.h"
-#include "input_clock.h"
-#include "input_decoder.h"
+#include "clock.h"
+#include "decoder.h"
 
 #include "../video_output/vout_internal.h"
 

diff --git a/src/input/input_decoder.h b/src/input/decoder.h
similarity index 98%
rename from src/input/input_decoder.h
rename to src/input/decoder.h
index 81f414bf5ce21e7411302cdeb281dfe0178f9449..181b00099fdf913bc79cb3ff1aa346a7f1e1ec23 100644 (file)
--- a/src/input/input_decoder.h
+++ b/src/input/decoder.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * input_decoder.h: Input decoder functions
+ * decoder.h: Input decoder functions
  *****************************************************************************
  * Copyright (C) 1998-2008 the VideoLAN team
  * Copyright (C) 2008 Laurent Aimar

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 8940e046c60640e2673099d2953b3a7c07583862..93a3cb6563ced7960651122af9b4339617287630 100644 (file)
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -39,8 +39,9 @@
 #include <vlc_aout.h>
 
 #include "input_internal.h"
-#include "input_clock.h"
-#include "input_decoder.h"
+#include "clock.h"
+#include "decoder.h"
+#include "es_out.h"
 
 #include "../stream_output/stream_output.h"
 

diff --git a/src/input/es_out.h b/src/input/es_out.h
new file mode 100644 (file)
index 0000000..3578d5a
--- /dev/null
+++ b/src/input/es_out.h
@@ -0,0 +1,46 @@
+/*****************************************************************************
+ * es_out.h: Input es_out 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_ES_OUT_H
+#define _INPUT_ES_OUT_H 1
+
+#include <vlc_common.h>
+
+es_out_t  *input_EsOutNew( input_thread_t *, int i_rate );
+void       input_EsOutDelete( es_out_t * );
+es_out_id_t *input_EsOutGetFromID( es_out_t *, int i_id );
+mtime_t    input_EsOutGetWakeup( es_out_t * );
+void       input_EsOutSetDelay( es_out_t *, int i_cat, int64_t );
+int        input_EsOutSetRecord( es_out_t *, bool b_record );
+void       input_EsOutChangeRate( es_out_t *, int );
+void       input_EsOutChangePause( es_out_t *, bool b_paused, mtime_t i_date );
+void       input_EsOutChangePosition( es_out_t * );
+bool       input_EsOutDecodersIsEmpty( es_out_t * );
+bool       input_EsOutIsBuffering( es_out_t * );
+
+#endif

diff --git a/src/input/input.c b/src/input/input.c
index 694db6634b5d811703e8587e877166314dd01765..d38b163d389e12f9954db4f7946ae0217b16c9b5 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -36,6 +36,7 @@
 #include <assert.h>
 
 #include "input_internal.h"
+#include "es_out.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 720a01a587432419038bd375f7f5624389c81164..260e95f8751a3f279d76f7d2ced9d0fdf88fd3f7 100644 (file)
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -327,19 +327,6 @@ void stream_AccessDelete( stream_t *s );
 void stream_AccessReset( stream_t *s );
 void stream_AccessUpdate( stream_t *s );
 
-/* es_out.c */
-es_out_t  *input_EsOutNew( input_thread_t *, int i_rate );
-void       input_EsOutDelete( es_out_t * );
-es_out_id_t *input_EsOutGetFromID( es_out_t *, int i_id );
-mtime_t    input_EsOutGetWakeup( es_out_t * );
-void       input_EsOutSetDelay( es_out_t *, int i_cat, int64_t );
-int        input_EsOutSetRecord( es_out_t *, bool b_record );
-void       input_EsOutChangeRate( es_out_t *, int );
-void       input_EsOutChangePause( es_out_t *, bool b_paused, mtime_t i_date );
-void       input_EsOutChangePosition( es_out_t * );
-bool       input_EsOutDecodersIsEmpty( es_out_t * );
-bool       input_EsOutIsBuffering( es_out_t * );
-
 /* Subtitles */
 char **subtitles_Detect( input_thread_t *, char* path, const char *fname );
 int subtitles_Filter( const char *);