From a04c372c027ee71ad7f255cd8ef49d93ffd3f0c4 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sat, 22 Dec 2018 09:24:03 +0100
Subject: [PATCH] simplify more includes of compatibility headers

Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/6fd6de31ad093b72f3f0c5c711fe0c9a5be3b4dd
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-22 (Sat, 22 Dec 2018)

Origin message was:
------------------
- simplify more includes of compatibility headers
---
 src/gui/lua/luainstance.cpp |  8 ++------
 src/gui/osd_helpers.cpp     |  7 +------
 src/gui/osd_setup.cpp       |  7 +------
 src/gui/update.cpp          |  2 +-
 src/zapit/src/zapit.cpp     | 12 +++++-------
 5 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/src/gui/lua/luainstance.cpp b/src/gui/lua/luainstance.cpp
index b7721d4d9..480c90a4a 100644
--- a/src/gui/lua/luainstance.cpp
+++ b/src/gui/lua/luainstance.cpp
@@ -36,12 +36,8 @@
 #include <driver/pictureviewer/pictureviewer.h>
 #include <driver/fontrenderer.h>
 #include <neutrino.h>
-#if HAVE_COOL_HARDWARE
-#include <video_cs.h>
-#endif
-#if USE_STB_HAL
-#include <video_hal.h>
-#endif
+
+#include <hardware/video.h>
 
 #include "luainstance.h"
 #include "lua_cc_header.h"
diff --git a/src/gui/osd_helpers.cpp b/src/gui/osd_helpers.cpp
index c42acb5b9..57a391360 100644
--- a/src/gui/osd_helpers.cpp
+++ b/src/gui/osd_helpers.cpp
@@ -14,12 +14,7 @@
 #include <gui/volumebar.h>
 #include <gui/osd_helpers.h>
 
-#if HAVE_COOL_HARDWARE
-#include <video_cs.h>
-#endif
-#if USE_STB_HAL
-#include <video_hal.h>
-#endif
+#include <hardware/video.h>
 
 extern CInfoClock *InfoClock;
 extern CTimeOSD *FileTimeOSD;
diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
index 65c5af971..6e00bb067 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -67,12 +67,7 @@
 #include <system/setting_helpers.h>
 #include "cs_api.h"
 
-#if HAVE_COOL_HARDWARE
-#include <video_cs.h>
-#endif
-#if USE_STB_HAL
-#include <video_hal.h>
-#endif
+#include <hardware/video.h>
 
 extern CRemoteControl * g_RemoteControl;
 
diff --git a/src/gui/update.cpp b/src/gui/update.cpp
index 2fef0f2d5..19847aec2 100644
--- a/src/gui/update.cpp
+++ b/src/gui/update.cpp
@@ -79,7 +79,7 @@
 #include <cs_api.h>
 
 #if HAVE_ARM_HARDWARE
-#include <video_cs.h>
+#include <hardware/video.h>
 extern cVideo * videoDecoder;
 #endif
 
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index ae1fb68bb..4a68c10c6 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -56,19 +56,17 @@
 
 #include <zapit/satconfig.h>
 #include <zapit/femanager.h>
-#include <hardware/dmx.h>
+
 #if HAVE_COOL_HARDWARE
 #include <record_cs.h>
 #include <playback_cs.h>
 #include <pwrmngr.h>
-#include <audio_cs.h>
-#include <video_cs.h>
-#endif
-#if USE_STB_HAL
-#include <video_hal.h>
-#include <audio_hal.h>
 #endif
 
+#include <hardware/audio.h>
+#include <hardware/dmx.h>
+#include <hardware/video.h>
+
 #include <driver/abstime.h>
 #include <system/set_threadname.h>
 #include <libdvbsub/dvbsub.h>