diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp index 214195864..f2f019fab 100644 --- a/src/gui/bouquetlist.cpp +++ b/src/gui/bouquetlist.cpp @@ -510,8 +510,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; } diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index ab0bc6668..846f69c35 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -717,7 +717,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; diff --git a/src/gui/channellist.h b/src/gui/channellist.h index 40d2c74d1..bdd542a39 100644 --- a/src/gui/channellist.h +++ b/src/gui/channellist.h @@ -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 diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 384d5256d..6d216b885 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1822,7 +1822,7 @@ void CNeutrinoApp::SetChannelMode(int newmode) else bouquetList = TVsatList; break; - case LIST_MODE_WEBTV: + case LIST_MODE_WEB: if (isRadioMode) bouquetList = RADIOwebList; else @@ -2921,7 +2921,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); @@ -5131,12 +5131,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); @@ -5159,12 +5159,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);