Moved clock interface from input_internal.h to input_clock.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 69a516007564a4c833996d43efac5a97477f4a3e..44f45a7cab47c1047d649dfbd12867f4db0bedf9 100644 (file)
--- 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/input_clock.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 930a7438e10dd33a52d99836e6ba953ed142eff6..2480eb90d0db179d186a7d3292265ab5b0ec18e3 100644 (file)
--- a/src/input/clock.c
+++ b/src/input/clock.c
@@ -30,8 +30,8 @@
 #endif
 
 #include <vlc_common.h>
-
-#include "input_internal.h"
+#include <vlc_input.h>
+#include "input_clock.h"
 
 /*
  * DISCUSSION : SYNCHRONIZATION METHOD

diff --git a/src/input/input_clock.h b/src/input/input_clock.h
new file mode 100644 (file)
index 0000000..33e0b86
--- /dev/null
+++ b/src/input/input_clock.h
@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * clock.h: clocks synchronisation
+ *****************************************************************************
+ * Copyright (C) 2008 the VideoLAN team
+ * Copyright (C) 2008 Laurent Aimar
+ * $Id$
+ *
+ * Authors: Laurent Aimar < fenrir _AT_ videolan _DOT_ org >
+ *
+ * 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_CLOCK_H
+#define _INPUT_CLOCK_H 1
+
+#include <vlc_common.h>
+
+typedef struct input_clock_t input_clock_t;
+
+input_clock_t *input_clock_New( bool b_master, int i_cr_average, int i_rate );
+void           input_clock_Delete( input_clock_t * );
+
+void    input_clock_SetPCR( input_clock_t *, vlc_object_t *p_log,
+                            bool b_can_pace_control, mtime_t i_clock, mtime_t i_system );
+void    input_clock_ResetPCR( input_clock_t * );
+mtime_t input_clock_GetTS( input_clock_t *, mtime_t i_pts_delay, mtime_t );
+void    input_clock_SetRate( input_clock_t *cl, int i_rate );
+void    input_clock_SetMaster( input_clock_t *cl, bool b_master );
+mtime_t input_clock_GetWakeup( input_clock_t *cl );
+
+#endif
+

diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index 805702dc1155adb36d508e571405cef9a65cc323..9966034714dd9f444d3a3fa06d299ac0a23c1d0a 100644 (file)
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -32,6 +32,8 @@
 #include <vlc_demux.h>
 #include <vlc_input.h>
 
+#include "input_clock.h"
+
 /*****************************************************************************
  *  Private input fields
  *****************************************************************************/
@@ -355,20 +357,6 @@ void       input_EsOutChangeState( es_out_t * );
 void       input_EsOutChangePosition( es_out_t * );
 bool input_EsOutDecodersEmpty( es_out_t * );
 
-/* clock.c */
-typedef struct input_clock_t input_clock_t;
-
-input_clock_t *input_clock_New( bool b_master, int i_cr_average, int i_rate );
-void           input_clock_Delete( input_clock_t * );
-
-void    input_clock_SetPCR( input_clock_t *, vlc_object_t *p_log,
-                            bool b_can_pace_control, mtime_t i_clock, mtime_t i_system );
-void    input_clock_ResetPCR( input_clock_t * );
-mtime_t input_clock_GetTS( input_clock_t *, mtime_t i_pts_delay, mtime_t );
-void    input_clock_SetRate( input_clock_t *cl, int i_rate );
-void    input_clock_SetMaster( input_clock_t *cl, bool b_master );
-mtime_t input_clock_GetWakeup( input_clock_t *cl );
-
 /* Subtitles */
 char **subtitles_Detect( input_thread_t *, char* path, const char *fname );
 int subtitles_Filter( const char *);