From: Adam Sutton <dev@adamsutton.me.uk>
Date: Sat, 5 Jan 2013 20:46:23 +0000 (+0000)
Subject: muxers: re-org to clean up dirs.
X-Git-Tag: v3.5~190
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c85cc101434883122c5f3f1303c4698f94233b1;p=thirdparty%2Ftvheadend.git

muxers: re-org to clean up dirs.
---

diff --git a/Makefile b/Makefile
index 63629f4a3..d88413977 100644
--- a/Makefile
+++ b/Makefile
@@ -127,8 +127,6 @@ SRCS += src/plumbing/tsfix.c \
 SRCS += src/dvr/dvr_db.c \
 	src/dvr/dvr_rec.c \
 	src/dvr/dvr_autorec.c \
-	src/dvr/ebml.c \
-	src/dvr/mkmux.c \
 
 SRCS += src/webui/webui.c \
 	src/webui/comet.c \
@@ -138,8 +136,10 @@ SRCS += src/webui/webui.c \
 	src/webui/html.c\
 
 SRCS += src/muxer.c \
-	src/muxer_pass.c \
-	src/muxer_tvh.c \
+	src/muxer/muxer_pass.c \
+	src/muxer/muxer_tvh.c \
+	src/muxer/tvh/ebml.c \
+	src/muxer/tvh/mkmux.c \
 
 #
 # Optional code
diff --git a/src/muxer.c b/src/muxer.c
index b0c9d99f8..6ec3a8a18 100644
--- a/src/muxer.c
+++ b/src/muxer.c
@@ -21,8 +21,8 @@
 #include "tvheadend.h"
 #include "service.h"
 #include "muxer.h"
-#include "muxer_tvh.h"
-#include "muxer_pass.h"
+#include "muxer/muxer_tvh.h"
+#include "muxer/muxer_pass.h"
 
 
 /**
diff --git a/src/muxer_pass.c b/src/muxer/muxer_pass.c
similarity index 100%
rename from src/muxer_pass.c
rename to src/muxer/muxer_pass.c
diff --git a/src/muxer_pass.h b/src/muxer/muxer_pass.h
similarity index 100%
rename from src/muxer_pass.h
rename to src/muxer/muxer_pass.h
diff --git a/src/muxer_tvh.c b/src/muxer/muxer_tvh.c
similarity index 99%
rename from src/muxer_tvh.c
rename to src/muxer/muxer_tvh.c
index 8555ba912..02846ae51 100644
--- a/src/muxer_tvh.c
+++ b/src/muxer/muxer_tvh.c
@@ -22,8 +22,8 @@
 #include "streaming.h"
 #include "epg.h"
 #include "channels.h"
-#include "dvr/mkmux.h"
 #include "muxer_tvh.h"
+#include "tvh/mkmux.h"
 
 typedef struct tvh_muxer {
   muxer_t;
diff --git a/src/muxer_tvh.h b/src/muxer/muxer_tvh.h
similarity index 100%
rename from src/muxer_tvh.h
rename to src/muxer/muxer_tvh.h
diff --git a/src/dvr/ebml.c b/src/muxer/tvh/ebml.c
similarity index 100%
rename from src/dvr/ebml.c
rename to src/muxer/tvh/ebml.c
diff --git a/src/dvr/ebml.h b/src/muxer/tvh/ebml.h
similarity index 100%
rename from src/dvr/ebml.h
rename to src/muxer/tvh/ebml.h
diff --git a/src/dvr/mkmux.c b/src/muxer/tvh/mkmux.c
similarity index 99%
rename from src/dvr/mkmux.c
rename to src/muxer/tvh/mkmux.c
index de9d8dff2..da6a34ba8 100644
--- a/src/dvr/mkmux.c
+++ b/src/muxer/tvh/mkmux.c
@@ -27,7 +27,7 @@
 
 #include "tvheadend.h"
 #include "streaming.h"
-#include "dvr.h"
+#include "dvr/dvr.h"
 #include "mkmux.h"
 #include "ebml.h"
 
diff --git a/src/dvr/mkmux.h b/src/muxer/tvh/mkmux.h
similarity index 100%
rename from src/dvr/mkmux.h
rename to src/muxer/tvh/mkmux.h