[vlc-commits] core: move clock from input to its own core folder

[Denis Charmet]

vlc | branch: master | Denis Charmet <typx at videolan.org> | Wed May  2 15:26:31 2018 +0200| [99bfdc3fbfd5f6f222239e934fabc39b8ce315c6] | committer: Rémi Denis-Courmont

core: move clock from input to its own core folder

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

 src/Makefile.am              | 4 ++--
 src/{input => clock}/clock.c | 3 +--
 src/{input => clock}/clock.h | 3 +--
 src/input/decoder.c          | 2 +-
 src/input/es_out.c           | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index d96df97ce0..b82bef0898 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -230,7 +230,7 @@ libvlccore_la_SOURCES = \
 	playlist/renderer.c \
 	input/item.c \
 	input/access.c \
-	input/clock.c \
+	clock/clock.c \
 	input/control.c \
 	input/decoder.c \
 	input/demux.c \
@@ -241,7 +241,7 @@ libvlccore_la_SOURCES = \
 	input/input.c \
 	input/info.h \
 	input/meta.c \
-	input/clock.h \
+	clock/clock.h \
 	input/decoder.h \
 	input/demux.h \
 	input/es_out.h \
diff --git a/src/input/clock.c b/src/clock/clock.c
similarity index 99%
rename from src/input/clock.c
rename to src/clock/clock.c
index 8b6501f037..8ccbd92f1b 100644
--- a/src/input/clock.c
+++ b/src/clock/clock.c
@@ -1,9 +1,8 @@
 /*****************************************************************************
  * clock.c: Clock/System date convertions, stream management
  *****************************************************************************
- * Copyright (C) 1999-2008 VLC authors and VideoLAN
+ * Copyright (C) 1999-2018 VLC authors and VideoLAN
  * Copyright (C) 2008 Laurent Aimar
- * $Id$
  *
  * Authors: Christophe Massiot <massiot at via.ecp.fr>
  *          Laurent Aimar < fenrir _AT_ videolan _DOT_ org >
diff --git a/src/input/clock.h b/src/clock/clock.h
similarity index 98%
rename from src/input/clock.h
rename to src/clock/clock.h
index 34b98de1b5..54ec392d81 100644
--- a/src/input/clock.h
+++ b/src/clock/clock.h
@@ -1,9 +1,8 @@
 /*****************************************************************************
  * clock.h: clocks synchronisation
  *****************************************************************************
- * Copyright (C) 2008 VLC authors and VideoLAN
+ * Copyright (C) 2008-2018 VLC authors and VideoLAN
  * Copyright (C) 2008 Laurent Aimar
- * $Id$
  *
  * Authors: Laurent Aimar < fenrir _AT_ videolan _DOT_ org >
  *
diff --git a/src/input/decoder.c b/src/input/decoder.c
index e708d3e485..4fc483dcc1 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -46,7 +46,7 @@
 #include "audio_output/aout_internal.h"
 #include "stream_output/stream_output.h"
 #include "input_internal.h"
-#include "clock.h"
+#include "../clock/clock.h"
 #include "decoder.h"
 #include "event.h"
 #include "resource.h"
diff --git a/src/input/es_out.c b/src/input/es_out.c
index 61ad913c94..3b909ebf62 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -41,7 +41,7 @@
 #include <vlc_meta.h>
 
 #include "input_internal.h"
-#include "clock.h"
+#include "../clock/clock.h"
 #include "decoder.h"
 #include "es_out.h"
 #include "event.h"