simplify more includes of compatibility headers

Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fd6de31ad
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-22 (Sat, 22 Dec 2018)

Origin message was:
------------------
- simplify more includes of compatibility headers

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

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"

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;

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;
 

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
 

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>