mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 01:11:06 +02:00
rename HAVE_COOL_HARDWARE => HAVE_CST_HARDWARE
Origin commit data
------------------
Branch: ni/coolstream
Commit: 524913f4ee
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-09-03 (Thu, 03 Sep 2020)
Origin message was:
------------------
- rename HAVE_COOL_HARDWARE => HAVE_CST_HARDWARE
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -84,7 +84,7 @@
|
||||
//NI InfoIcons
|
||||
#include <gui/infoicons.h>
|
||||
|
||||
#if HAVE_COOL_HARDWARE || HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
|
||||
#if HAVE_CST_HARDWARE || HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
|
||||
#define LCD_MODE CVFD::MODE_MENU_UTF8
|
||||
#else
|
||||
#define LCD_MODE CVFD::MODE_MOVIE
|
||||
@@ -341,7 +341,7 @@ void CMoviePlayerGui::restoreNeutrino()
|
||||
//NI
|
||||
CZapit::getInstance()->setMoviePlayer(true);// let CCamManager::SetMode know, the call is from MoviePlayer
|
||||
|
||||
#if ! HAVE_COOL_HARDWARE
|
||||
#if ! HAVE_CST_HARDWARE
|
||||
g_Zapit->unlockPlayBack();
|
||||
#else
|
||||
CZapit::getInstance()->EnablePlayback(true);
|
||||
@@ -481,7 +481,7 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey)
|
||||
break;
|
||||
}
|
||||
do {
|
||||
#if ! HAVE_COOL_HARDWARE
|
||||
#if ! HAVE_CST_HARDWARE
|
||||
is_file_player = true;
|
||||
#endif
|
||||
PlayFile();
|
||||
@@ -1672,7 +1672,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
|
||||
bool first_start = true;
|
||||
bool update_lcd = true;
|
||||
neutrino_msg_t lastmsg = 0;
|
||||
#if HAVE_COOL_HARDWARE
|
||||
#if HAVE_CST_HARDWARE
|
||||
int eof = 0;
|
||||
int eof2 = 0;
|
||||
int position_tmp = 0;
|
||||
@@ -1782,7 +1782,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
|
||||
#ifdef DEBUG
|
||||
printf("CMoviePlayerGui::%s: spd %d pos %d/%d (%d, %d%%)\n", __func__, speed, position, duration, duration-position, file_prozent);
|
||||
#endif
|
||||
#if HAVE_COOL_HARDWARE
|
||||
#if HAVE_CST_HARDWARE
|
||||
/* in case ffmpeg report incorrect values */
|
||||
if(file_prozent > 89 && (playstate == CMoviePlayerGui::PLAY) && (speed == 1)){
|
||||
if(position_tmp != position){
|
||||
@@ -1811,7 +1811,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
|
||||
eof = 0;
|
||||
#endif
|
||||
}
|
||||
#if ! HAVE_COOL_HARDWARE
|
||||
#if ! HAVE_CST_HARDWARE
|
||||
else
|
||||
{
|
||||
at_eof = true;
|
||||
@@ -1996,7 +1996,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
|
||||
//NI if (timeshift == TSHIFT_MODE_OFF)
|
||||
callInfoViewer();
|
||||
} else if (msg == (neutrino_msg_t) g_settings.mpkey_bookmark) {
|
||||
#if HAVE_COOL_HARDWARE || HAVE_ARM_HARDWARE
|
||||
#if HAVE_CST_HARDWARE || HAVE_ARM_HARDWARE
|
||||
if (selectChapter() != 0)
|
||||
#endif
|
||||
handleMovieBrowser((neutrino_msg_t) g_settings.mpkey_bookmark, position);
|
||||
|
Reference in New Issue
Block a user