From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 8 Mar 2018 15:09:16 +0000 (+0100)
Subject: move src/descrambler.h to src/descrambler/descrambler.h
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd901755a06e4654695b95072fff9eb301ad9e9a;p=thirdparty%2Ftvheadend.git

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 63209999b..2637e1ae5 100644
--- 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 3481b288b..b77f48e85 100644
--- 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 9083d4208..73d32b41c 100644
--- 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 6ffe640e9..7570e8eed 100644
--- 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"