mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 09:51:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

cleanup from unsupported DUCKBOX_HARDWARE

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: bc0de58721
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-08 (Wed, 08 Nov 2017)

Origin message was:
------------------
- cleanup from unsupported DUCKBOX_HARDWARE

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-11-08 09:28:34 +01:00
parent db8e96aa9b
commit b9fd1ef634
12 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/gui/movieplayer.cpp
View File

@@ -89,7 +89,7 @@ bool glcd_play = false;
#include <gui/widget/stringinput_ext.h>
#include <gui/screensetup.h>
#include <gui/widget/msgbox.h>
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE
#if HAVE_SPARK_HARDWARE
#include <libavcodec/avcodec.h>
#endif
@@ -1379,19 +1379,19 @@ bool CMoviePlayerGui::PlayFileStart(void)
duration = p_movie_info->length * 60 * 1000;
int percent = CZapit::getInstance()->GetPidVolume(p_movie_info->channelId, currentapid, currentac3 == 1);
CZapit::getInstance()->SetVolumePercent(percent);
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE
#if HAVE_SPARK_HARDWARE
CScreenSetup cSS;
cSS.showBorder(p_movie_info->epgId);
#endif
} else {
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE
#if HAVE_SPARK_HARDWARE
CScreenSetup cSS;
cSS.showBorder(0);
#endif
}
file_prozent = 0;
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE
#if HAVE_SPARK_HARDWARE
old3dmode = frameBuffer->get3DMode();
#endif
#ifdef ENABLE_GRAPHLCD
@@ -1456,7 +1456,7 @@ bool CMoviePlayerGui::PlayFileStart(void)
repeat_mode = (repeat_mode_enum) g_settings.movieplayer_repeat_on;
playstate = CMoviePlayerGui::PLAY;
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true);
#if HAVE_DUCKBOX_HARDWARE || HAVE_SPARK_HARDWARE
#if HAVE_SPARK_HARDWARE
CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FF, false);
CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
@@ -1488,7 +1488,7 @@ bool CMoviePlayerGui::PlayFileStart(void)
if (g_settings.timeshift_pause)
{
playstate = CMoviePlayerGui::PAUSE;
#if HAVE_DUCKBOX_HARDWARE || HAVE_SPARK_HARDWARE
#if HAVE_SPARK_HARDWARE
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FF, false);
@@ -1814,7 +1814,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
repeat_mode = REPEAT_OFF;
g_settings.movieplayer_repeat_on = repeat_mode;
callInfoViewer();
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE
#if HAVE_SPARK_HARDWARE
} else if (msg == (neutrino_msg_t) g_settings.mpkey_next3dmode) {
frameBuffer->set3DMode((CFrameBuffer::Mode3D)(((frameBuffer->get3DMode()) + 1) % CFrameBuffer::Mode3D_SIZE));
#endif
@@ -1830,7 +1830,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
FileTimeOSD->setMpTimeForced(false);
if (playstate > CMoviePlayerGui::PLAY) {
playstate = CMoviePlayerGui::PLAY;
#if HAVE_DUCKBOX_HARDWARE || HAVE_SPARK_HARDWARE
#if HAVE_SPARK_HARDWARE
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true);
CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
@@ -1875,7 +1875,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
if (playstate == CMoviePlayerGui::PAUSE) {
playstate = CMoviePlayerGui::PLAY;
//CVFD::getInstance()->ShowIcon(VFD_ICON_PAUSE, false);
#if HAVE_DUCKBOX_HARDWARE || HAVE_SPARK_HARDWARE
#if HAVE_SPARK_HARDWARE
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true);
CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
@@ -1886,7 +1886,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
} else {
playstate = CMoviePlayerGui::PAUSE;
//CVFD::getInstance()->ShowIcon(VFD_ICON_PAUSE, true);
#if HAVE_DUCKBOX_HARDWARE || HAVE_SPARK_HARDWARE
#if HAVE_SPARK_HARDWARE
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, false);
CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, true);
CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
@@ -1932,7 +1932,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
bool setSpeed = false;
if (msg == (neutrino_msg_t) g_settings.mpkey_rewind) {
newspeed = (speed >= 0) ? -1 : (speed - 1);
#if HAVE_DUCKBOX_HARDWARE || HAVE_SPARK_HARDWARE
#if HAVE_SPARK_HARDWARE
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true);
CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FR, true);
@@ -1940,7 +1940,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
#endif
} else {
newspeed = (speed <= 0) ? 2 : (speed + 1);
#if HAVE_DUCKBOX_HARDWARE || HAVE_SPARK_HARDWARE
#if HAVE_SPARK_HARDWARE
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true);
CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
@@ -2055,7 +2055,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
#if 0
clearSubtitle();
#endif
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE
#if HAVE_SPARK_HARDWARE
} else if (msg == CRCInput::RC_text) {
int pid = playback->GetFirstTeletextPid();
if (pid > -1) {
@@ -2194,7 +2194,7 @@ void CMoviePlayerGui::PlayFileEnd(bool restore)
playback->SetSpeed(1);
playback->Close();
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE
#if HAVE_SPARK_HARDWARE
frameBuffer->set3DMode(old3dmode);
CScreenSetup cSS;
cSS.showBorder(CZapit::getInstance()->GetCurrentChannelID());
@@ -2213,7 +2213,7 @@ void CMoviePlayerGui::PlayFileEnd(bool restore)
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, false);
CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
#if HAVE_DUCKBOX_HARDWARE || HAVE_SPARK_HARDWARE
#if HAVE_SPARK_HARDWARE
CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FF, false);
#endif
@@ -2799,7 +2799,7 @@ void CMoviePlayerGui::UpdatePosition()
void CMoviePlayerGui::StopSubtitles(bool enable_glcd_mirroring __attribute__((unused)))
{
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE
#if HAVE_SPARK_HARDWARE
printf("[CMoviePlayerGui] %s\n", __FUNCTION__);
int ttx, ttxpid, ttxpage;
@@ -2850,7 +2850,7 @@ void CMoviePlayerGui::showHelp()
void CMoviePlayerGui::StartSubtitles(bool show __attribute__((unused)))
{
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE
#if HAVE_SPARK_HARDWARE
printf("[CMoviePlayerGui] %s: %s\n", __FUNCTION__, show ? "Show" : "Not show");
#ifdef ENABLE_GRAPHLCD
nGLCD::MirrorOSD(false);
@@ -3537,7 +3537,7 @@ void CMoviePlayerGui::makeScreenShot(bool autoshot, bool forcover)
sc->SetSize(w, h);
}
}
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE
#if HAVE_SPARK_HARDWARE
sc->Start("-r 320 -j 75");
#else
sc->Start();