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

movieplayer: rename isWebTV => isWebChannel

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: a6e00fb606
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- movieplayer: rename isWebTV => isWebChannel

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-11-03 09:36:20 +01:00
committed by Thilo Graf
parent b66281662e
commit c42d91db42
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/movieplayer.cpp
View File

@@ -277,7 +277,7 @@ void CMoviePlayerGui::cutNeutrino()
playing = true; playing = true;
/* set g_InfoViewer update timer to 1 sec, should be reset to default from restoreNeutrino->set neutrino mode */ /* set g_InfoViewer update timer to 1 sec, should be reset to default from restoreNeutrino->set neutrino mode */
if (!isWebTV) if (!isWebChannel)
g_InfoViewer->setUpdateTimer(1000 * 1000); g_InfoViewer->setUpdateTimer(1000 * 1000);
if (isUPNP) if (isUPNP)
@@ -298,7 +298,7 @@ void CMoviePlayerGui::cutNeutrino()
int new_mode = NeutrinoMessages::mode_unknown; int new_mode = NeutrinoMessages::mode_unknown;
m_LastMode = CNeutrinoApp::getInstance()->getMode(); m_LastMode = CNeutrinoApp::getInstance()->getMode();
if (isWebTV) if (isWebChannel)
{ {
new_mode = (m_LastMode == NeutrinoMessages::mode_radio) ? NeutrinoMessages::mode_webradio : NeutrinoMessages::mode_webtv; new_mode = (m_LastMode == NeutrinoMessages::mode_radio) ? NeutrinoMessages::mode_webradio : NeutrinoMessages::mode_webtv;
m_LastMode |= NeutrinoMessages::norezap; m_LastMode |= NeutrinoMessages::norezap;
@@ -663,7 +663,7 @@ void CMoviePlayerGui::ClearFlags()
isHTTP = false; isHTTP = false;
isLuaPlay = false; isLuaPlay = false;
isUPNP = false; isUPNP = false;
isWebTV = false; isWebChannel = false;
isYT = false; isYT = false;
is_file_player = false; is_file_player = false;
timeshift = TSHIFT_MODE_OFF; timeshift = TSHIFT_MODE_OFF;
@@ -866,11 +866,11 @@ void *CMoviePlayerGui::ShowStartHint(void *arg)
caller->playback->RequestAbort(); caller->playback->RequestAbort();
} }
#if 0 #if 0
else if (caller->isWebTV) { else if (caller->isWebChannel) {
CNeutrinoApp::getInstance()->handleMsg(msg, data); CNeutrinoApp::getInstance()->handleMsg(msg, data);
} }
#endif #endif
else if (caller->isWebTV && ((msg == (neutrino_msg_t) g_settings.key_quickzap_up ) || (msg == (neutrino_msg_t) g_settings.key_quickzap_down))) { else if (caller->isWebChannel && ((msg == (neutrino_msg_t) g_settings.key_quickzap_up ) || (msg == (neutrino_msg_t) g_settings.key_quickzap_down))) {
caller->playback->RequestAbort(); caller->playback->RequestAbort();
g_RCInput->postMsg(msg, data); g_RCInput->postMsg(msg, data);
} }
@@ -1261,7 +1261,7 @@ bool CMoviePlayerGui::PlayBackgroundStart(const std::string &file, const std::st
instance_bg->ClearFlags(); instance_bg->ClearFlags();
instance_bg->ClearQueue(); instance_bg->ClearQueue();
instance_bg->isWebTV = true; instance_bg->isWebChannel = true;
instance_bg->is_file_player = true; instance_bg->is_file_player = true;
instance_bg->isHTTP = true; instance_bg->isHTTP = true;
instance_bg->file_name = realUrl; instance_bg->file_name = realUrl;
@@ -1363,7 +1363,7 @@ bool CMoviePlayerGui::PlayFileStart(void)
handleMovieBrowser(CRCInput::RC_nokey, position); handleMovieBrowser(CRCInput::RC_nokey, position);
cutNeutrino(); cutNeutrino();
if (isWebTV) if (isWebChannel)
videoDecoder->setBlank(true); videoDecoder->setBlank(true);
#if 0 #if 0
@@ -1808,7 +1808,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
fromInfoviewer = false; fromInfoviewer = false;
playstate = CMoviePlayerGui::STOPPED; playstate = CMoviePlayerGui::STOPPED;
filelist_it = vzap_it; filelist_it = vzap_it;
} else if (timeshift == TSHIFT_MODE_OFF && !isWebTV /* && !isYT */ && (msg == (neutrino_msg_t) g_settings.mpkey_next_repeat_mode)) { } else if (timeshift == TSHIFT_MODE_OFF && !isWebChannel /* && !isYT */ && (msg == (neutrino_msg_t) g_settings.mpkey_next_repeat_mode)) {
repeat_mode = (repeat_mode_enum)((int)repeat_mode + 1); repeat_mode = (repeat_mode_enum)((int)repeat_mode + 1);
if (repeat_mode > (int) REPEAT_ALL) if (repeat_mode > (int) REPEAT_ALL)
repeat_mode = REPEAT_OFF; repeat_mode = REPEAT_OFF;
@@ -3394,7 +3394,7 @@ void CMoviePlayerGui::selectAutoLang()
} }
} }
#if 0 #if 0
if (isWebTV && g_settings.auto_subs && numsubs > 0) { if (isWebChannel && g_settings.auto_subs && numsubs > 0) {
for(int i = 0; i < 3; i++) { for(int i = 0; i < 3; i++) {
if(g_settings.pref_subs[i].empty() || g_settings.pref_subs[i] == "none") if(g_settings.pref_subs[i].empty() || g_settings.pref_subs[i] == "none")
continue; continue;

2
src/gui/movieplayer.h
View File

@@ -178,7 +178,7 @@ class CMoviePlayerGui : public CMenuTarget
bool isMovieBrowser; bool isMovieBrowser;
bool isHTTP; bool isHTTP;
bool isUPNP; bool isUPNP;
bool isWebTV; bool isWebChannel;
bool isYT; bool isYT;
bool showStartingHint; bool showStartingHint;
static CMovieBrowser* moviebrowser; static CMovieBrowser* moviebrowser;