[vlc-devel] commit: Sanitize input headers (pass 1). (Laurent Aimar )
git version control
git at videolan.org
Mon Oct 13 20:24:53 CEST 2008
vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Mon Oct 13 19:52:33 2008 +0200| [6db5caeffaab8e61e963a296287ea91f0049be19] | committer: Laurent Aimar
Sanitize input headers (pass 1).
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6db5caeffaab8e61e963a296287ea91f0049be19
---
src/Makefile.am | 5 ++-
src/input/clock.c | 4 +-
src/input/{input_clock.h => clock.h} | 0
src/input/decoder.c | 4 +-
src/input/{input_decoder.h => decoder.h} | 2 +-
src/input/es_out.c | 5 ++-
src/input/es_out.h | 46 ++++++++++++++++++++++++++++++
src/input/input.c | 1 +
src/input/input_internal.h | 13 --------
9 files changed, 58 insertions(+), 22 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index afe3101..0a56eee 100644
--- 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 7019457..beee45e 100644
--- 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 1306181..bbc01aa 100644
--- 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 81f414b..181b000 100644
--- 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 8940e04..93a3cb6 100644
--- 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
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 at 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 694db66..d38b163 100644
--- 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 720a01a..260e95f 100644
--- 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 *);
More information about the vlc-devel
mailing list