muxers: re-org to clean up dirs.

diff --git a/Makefile b/Makefile
index 63629f4a36a813002fb500a47aaaace6fb6db475..d88413977a7d43b4b2855102d96900f9ea33222e 100644 (file)
--- 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 b0c9d99f8fd9fd689348bcdb7760f95ec9da77bb..6ec3a8a18879a45e2c7a85d19c57eb569763fb74 100644 (file)
--- 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 8555ba9129c0aa0c10923d99f632cc210d02af20..02846ae51b507b047110fbac5b253c5896a5f84e 100644 (file)
--- 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 de9d8dff22dd8ef57c0706c833e9361cd38de864..da6a34ba8e997aa9af012e645bfb2f1f4bc649d5 100644 (file)
--- 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