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

rename LIST_MODE_WEBTV => LIST_MODE_WEB

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

Origin message was:
------------------
- rename LIST_MODE_WEBTV => LIST_MODE_WEB

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-11-03 09:36:19 +01:00
parent 0898583959
commit 0ab3e628f3
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/bouquetlist.cpp
View File

@@ -514,8 +514,8 @@ int CBouquetList::show(bool bShowChannelList)
return CHANLIST_CHANGE_MODE;
}
} else if(msg == CRCInput::RC_www) {
if(!favonly && bShowChannelList && CNeutrinoApp::getInstance()->GetChannelMode() != LIST_MODE_WEBTV) {
CNeutrinoApp::getInstance()->SetChannelMode(LIST_MODE_WEBTV);
if(!favonly && bShowChannelList && CNeutrinoApp::getInstance()->GetChannelMode() != LIST_MODE_WEB) {
CNeutrinoApp::getInstance()->SetChannelMode(LIST_MODE_WEB);
hide();
return CHANLIST_CHANGE_MODE;
}

2
src/gui/channellist.cpp
View File

@@ -721,7 +721,7 @@ int CChannelList::show()
}
else if (CNeutrinoApp::getInstance()->listModeKey(msg)) {
if (!edit_state) {
//FIXME: what about LIST_MODE_WEBTV?
//FIXME: what about LIST_MODE_WEB?
int newmode = msg == CRCInput::RC_sat ? LIST_MODE_SAT : LIST_MODE_FAV;
CNeutrinoApp::getInstance()->SetChannelMode(newmode);
res = CHANLIST_CHANGE_MODE;

2
src/gui/channellist.h
View File

@@ -51,7 +51,7 @@
enum {
LIST_MODE_FAV,
LIST_MODE_PROV,
LIST_MODE_WEBTV,
LIST_MODE_WEB,
LIST_MODE_SAT,
LIST_MODE_ALL,
LIST_MODE_LAST

16
src/neutrino.cpp
View File

@@ -1964,7 +1964,7 @@ void CNeutrinoApp::SetChannelMode(int newmode)
else
bouquetList = TVsatList;
break;
case LIST_MODE_WEBTV:
case LIST_MODE_WEB:
if (isRadioMode)
bouquetList = RADIOwebList;
else
@@ -3130,7 +3130,7 @@ int CNeutrinoApp::showChannelList(const neutrino_msg_t _msg, bool from_menu)
SetChannelMode(LIST_MODE_PROV);
nNewChannel = bouquetList->exec(true);
} else if(msg == CRCInput::RC_www) {
SetChannelMode(LIST_MODE_WEBTV);
SetChannelMode(LIST_MODE_WEB);
if (bouquetList->Bouquets.empty())
SetChannelMode(LIST_MODE_PROV);
nNewChannel = bouquetList->exec(true);
@@ -5446,12 +5446,12 @@ bool CNeutrinoApp::adjustToChannelID(const t_channel_id channel_id)
if (has_channel && first_mode_found < 0)
first_mode_found = LIST_MODE_PROV;
if(!has_channel && old_mode == LIST_MODE_PROV)
new_mode = LIST_MODE_WEBTV;
new_mode = LIST_MODE_WEB;
has_channel = TVwebList->adjustToChannelID(channel_id);
if (has_channel && first_mode_found < 0)
first_mode_found = LIST_MODE_WEBTV;
if(!has_channel && old_mode == LIST_MODE_WEBTV)
first_mode_found = LIST_MODE_WEB;
if(!has_channel && old_mode == LIST_MODE_WEB)
new_mode = LIST_MODE_SAT;
has_channel = TVsatList->adjustToChannelID(channel_id);
@@ -5474,12 +5474,12 @@ bool CNeutrinoApp::adjustToChannelID(const t_channel_id channel_id)
if (has_channel && first_mode_found < 0)
first_mode_found = LIST_MODE_PROV;
if(!has_channel && old_mode == LIST_MODE_PROV)
new_mode = LIST_MODE_WEBTV;
new_mode = LIST_MODE_WEB;
has_channel = RADIOwebList->adjustToChannelID(channel_id);
if (has_channel && first_mode_found < 0)
first_mode_found = LIST_MODE_WEBTV;
if(!has_channel && old_mode == LIST_MODE_WEBTV)
first_mode_found = LIST_MODE_WEB;
if(!has_channel && old_mode == LIST_MODE_WEB)
new_mode = LIST_MODE_SAT;
has_channel = RADIOsatList->adjustToChannelID(channel_id);