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

fix mode in SetChannelMode()

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


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

Origin message was:
------------------
- fix mode in SetChannelMode()

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:19 +01:00
committed by Thilo Graf
parent 4f9b679dca
commit 0ba0f29836
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/neutrino.cpp
View File

@@ -1794,10 +1794,12 @@ void CNeutrinoApp::channelsInit(bool bOnly)
void CNeutrinoApp::SetChannelMode(int newmode)
{
printf("CNeutrinoApp::SetChannelMode %d [%s]\n", newmode, mode == mode_radio ? "radio" : "tv");
bool isRadioMode = (mode == mode_radio || mode == mode_webradio);
printf("CNeutrinoApp::SetChannelMode %d [%s]\n", newmode, isRadioMode ? "radio" : "tv");
int *sortmode;
if(mode == mode_radio) {
if (isRadioMode) {
channelList = RADIOchannelList;
g_settings.channel_mode_radio = newmode;
sortmode = radiosort;
@@ -1809,25 +1811,25 @@ void CNeutrinoApp::SetChannelMode(int newmode)
switch(newmode) {
case LIST_MODE_FAV:
if(mode == mode_radio)
if (isRadioMode)
bouquetList = RADIOfavList;
else
bouquetList = TVfavList;
break;
case LIST_MODE_SAT:
if(mode == mode_radio)
if (isRadioMode)
bouquetList = RADIOsatList;
else
bouquetList = TVsatList;
break;
case LIST_MODE_WEBTV:
if(mode == mode_radio)
if (isRadioMode)
bouquetList = RADIOwebList;
else
bouquetList = TVwebList;
break;
case LIST_MODE_ALL:
if(mode == mode_radio)
if (isRadioMode)
bouquetList = RADIOallList;
else
bouquetList = TVallList;
@@ -1836,7 +1838,7 @@ void CNeutrinoApp::SetChannelMode(int newmode)
newmode = LIST_MODE_PROV;
/* fall through */
case LIST_MODE_PROV:
if(mode == mode_radio)
if (isRadioMode)
bouquetList = RADIObouquetList;
else
bouquetList = TVbouquetList;