From a424fd9d7128b6afb3558305cb9a89d813ac7f59 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 7 Nov 2017 21:21:58 +0100 Subject: [PATCH] movieplayer: cleanup from unsupported hardware ifdefs Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/868f6184aeecc1b90961e1e813c282136f189a5b Author: vanhofen Date: 2017-11-07 (Tue, 07 Nov 2017) Origin message was: ------------------ - movieplayer: cleanup from unsupported hardware ifdefs Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- src/gui/movieplayer.cpp | 50 ----------------------------------------- 1 file changed, 50 deletions(-) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 7ef1b5d78..5ff9b034f 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -513,49 +513,15 @@ void CMoviePlayerGui::updateLcd() switch (playstate) { case CMoviePlayerGui::PAUSE: -#if !defined(BOXMODEL_UFS910) \ - && !defined(BOXMODEL_UFS912) \ - && !defined(BOXMODEL_UFS913) \ - && !defined(BOXMODEL_UFS922) \ - && !defined(BOXMODEL_FORTIS_HDBOX) \ - && !defined(BOXMODEL_OCTAGON1008) \ - && !defined(BOXMODEL_HS7110) \ - && !defined(BOXMODEL_HS7810A) \ - && !defined(BOXMODEL_HS7119) \ - && !defined(BOXMODEL_HS7819) \ - && !defined(BOXMODEL_IPBOX9900) \ - && !defined(BOXMODEL_IPBOX99) \ - && !defined(BOXMODEL_IPBOX55) - lcd = "|| "; -#else - lcd = ""; -#endif if (speed < 0) { sprintf(tmp, "%dx<| ", abs(speed)); lcd = tmp; } else if (speed > 0) { sprintf(tmp, "%dx|> ", abs(speed)); lcd = tmp; -#if !defined(BOXMODEL_UFS910) \ - && !defined(BOXMODEL_UFS912) \ - && !defined(BOXMODEL_UFS913) \ - && !defined(BOXMODEL_UFS922) \ - && !defined(BOXMODEL_OCTAGON1008) \ - && !defined(BOXMODEL_HS7110) \ - && !defined(BOXMODEL_HS7810A) \ - && !defined(BOXMODEL_HS7119) \ - && !defined(BOXMODEL_HS7819) \ - && !defined(BOXMODEL_IPBOX9900) \ - && !defined(BOXMODEL_IPBOX99) \ - && !defined(BOXMODEL_IPBOX55) } else lcd = "|| "; -#else - } else - lcd = ""; -#endif break; -#if !defined(BOXMODEL_OCTAGON1008) case CMoviePlayerGui::REW: sprintf(tmp, "%dx<< ", abs(speed)); lcd = tmp; @@ -564,24 +530,8 @@ void CMoviePlayerGui::updateLcd() sprintf(tmp, "%dx>> ", abs(speed)); lcd = tmp; break; -#endif case CMoviePlayerGui::PLAY: -#if !defined(BOXMODEL_UFS910) \ - && !defined(BOXMODEL_UFS912) \ - && !defined(BOXMODEL_UFS913) \ - && !defined(BOXMODEL_UFS922) \ - && !defined(BOXMODEL_FORTIS_HDBOX) \ - && !defined(BOXMODEL_OCTAGON1008) \ - && !defined(BOXMODEL_HS7110) \ - && !defined(BOXMODEL_HS7810A) \ - && !defined(BOXMODEL_HS7119) \ - && !defined(BOXMODEL_HS7819) \ - && !defined(BOXMODEL_CUBEREVO_MINI2) \ - && !defined(BOXMODEL_IPBOX9900) \ - && !defined(BOXMODEL_IPBOX99) \ - && !defined(BOXMODEL_IPBOX55) lcd = "> "; -#endif break; default: break;