From 6c3b341910c1257ff991e4ea63fd888c1c060356 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 22 Dec 2018 20:17:24 +0100 Subject: [PATCH] move playback.h compatibility header file to the other ones Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/b87b7d3c495c9252e42a3ba4295f76288111be7e Author: vanhofen Date: 2018-12-22 (Sat, 22 Dec 2018) Origin message was: ------------------ - move playback.h compatibility header file to the other ones ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- lib/hardware/coolstream/hd1/libcoolstream/playback.h | 1 - lib/hardware/coolstream/hd2/libcoolstream/playback.h | 1 - lib/hardware/playback.h | 8 ++++++++ src/gui/movieplayer.h | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) delete mode 100644 lib/hardware/coolstream/hd1/libcoolstream/playback.h delete mode 100644 lib/hardware/coolstream/hd2/libcoolstream/playback.h create mode 100644 lib/hardware/playback.h diff --git a/lib/hardware/coolstream/hd1/libcoolstream/playback.h b/lib/hardware/coolstream/hd1/libcoolstream/playback.h deleted file mode 100644 index 95ea0884e..000000000 --- a/lib/hardware/coolstream/hd1/libcoolstream/playback.h +++ /dev/null @@ -1 +0,0 @@ -#include "playback_cs.h" diff --git a/lib/hardware/coolstream/hd2/libcoolstream/playback.h b/lib/hardware/coolstream/hd2/libcoolstream/playback.h deleted file mode 100644 index 95ea0884e..000000000 --- a/lib/hardware/coolstream/hd2/libcoolstream/playback.h +++ /dev/null @@ -1 +0,0 @@ -#include "playback_cs.h" diff --git a/lib/hardware/playback.h b/lib/hardware/playback.h new file mode 100644 index 000000000..d19148243 --- /dev/null +++ b/lib/hardware/playback.h @@ -0,0 +1,8 @@ +#if HAVE_COOL_HARDWARE +#include +#elif USE_STB_HAL +#include +#else +#error neither HAVE_COOL_HARDWARE nor USE_STB_HAL defined. +#error do you need to include config.h? +#endif diff --git a/src/gui/movieplayer.h b/src/gui/movieplayer.h index 575c91ae4..d03350ddc 100644 --- a/src/gui/movieplayer.h +++ b/src/gui/movieplayer.h @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include