Sanitize input headers (pass 1).

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 \

src/input/clock.c

 /*****************************************************************************
- * 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

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"
 

src/input/input_decoder.h → src/input/decoder.h

 /*****************************************************************************
- * input_decoder.h: Input decoder functions
+ * decoder.h: Input decoder functions
  *****************************************************************************
  * Copyright (C) 1998-2008 the VideoLAN team
  * Copyright (C) 2008 Laurent Aimar

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"
 

src/input/es_out.h

+/*****************************************************************************
+ * 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

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"

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 *);