move src/descrambler.h to src/descrambler/descrambler.h

diff --git a/src/descrambler.h b/src/descrambler/descrambler.h
similarity index 100%
rename from src/descrambler.h
rename to src/descrambler/descrambler.h

diff --git a/src/esstream.h b/src/esstream.h
index 63209999b1e34695cdaa1346c21df5d9562ccdbd..2637e1ae5a19f4ff473ed2725a3e1190b106e75b 100644 (file)
--- a/src/esstream.h
+++ b/src/esstream.h
@@ -20,7 +20,7 @@
 #ifndef ESSTREAM_H__
 #define ESSTREAM_H__
 
-#include "descrambler.h"
+#include "descrambler/descrambler.h"
 #include "input/mpegts/dvb.h"
 
 /**

diff --git a/src/htsp_server.c b/src/htsp_server.c
index 3481b288b2fc29c45ff71a6f55f93a210581cc63..b77f48e85e2ee84b293b8f8994c983d27032ad00 100644 (file)
--- a/src/htsp_server.c
+++ b/src/htsp_server.c
@@ -29,9 +29,7 @@
 #include "streaming.h"
 #include "htsmsg_binary.h"
 #include "epg.h"
-#include "plumbing/tsfix.h"
 #include "imagecache.h"
-#include "descrambler.h"
 #include "descrambler/caid.h"
 #include "notify.h"
 #include "htsmsg_json.h"

diff --git a/src/main.c b/src/main.c
index 9083d4208ba76b5b9c67edc1d1c598a8d50f7643..73d32b41c0a201ebdea063b9d6fee24f488b1836 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -47,7 +47,7 @@
 #include "spawn.h"
 #include "subscriptions.h"
 #include "service_mapper.h"
-#include "descrambler.h"
+#include "descrambler/descrambler.h"
 #include "dvr/dvr.h"
 #include "htsp_server.h"
 #include "satip/server.h"

diff --git a/src/service.c b/src/service.c
index 6ffe640e9eba2df3905605c1c15d3d18f0667ec8..7570e8eedec6ebca6a3f913763d3d4fb71aada12 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -42,7 +42,7 @@
 #include "atomic.h"
 #include "htsp_server.h"
 #include "lang_codes.h"
-#include "descrambler.h"
+#include "descrambler/descrambler.h"
 #include "descrambler/caid.h"
 #include "input.h"
 #include "access.h"