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

Merge branch 'cst-next' into nmp-cst-next

Browse Source 
Origin commit data
------------------
Commit: 16afe5c81e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-28 (Thu, 28 Jan 2016)
This commit is contained in:
Michael Liebmann
2016-01-28 14:17:14 +01:00
parent 7138dc78f6 d9f2427b3c
commit 9450b80eb0
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/neutrino.cpp
View File

@@ -231,6 +231,7 @@ CNeutrinoApp::CNeutrinoApp()
SetupFrameBuffer(); SetupFrameBuffer();
mode = mode_unknown; mode = mode_unknown;
lastMode = mode_unknown;
channelList = NULL; channelList = NULL;
TVchannelList = NULL; TVchannelList = NULL;
RADIOchannelList = NULL; RADIOchannelList = NULL;
@@ -1780,6 +1781,7 @@ void CNeutrinoApp::InitZapper()
int tvmode = CZapit::getInstance()->getMode() & CZapitClient::MODE_TV; int tvmode = CZapit::getInstance()->getMode() & CZapitClient::MODE_TV;
lastChannelMode = tvmode ? g_settings.channel_mode : g_settings.channel_mode_radio; lastChannelMode = tvmode ? g_settings.channel_mode : g_settings.channel_mode_radio;
mode = tvmode ? mode_tv : mode_radio; mode = tvmode ? mode_tv : mode_radio;
lastMode = mode;
SDTreloadChannels = false; SDTreloadChannels = false;
channelsInit(); channelsInit();
@@ -3321,6 +3323,10 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
if(mode != mode_standby) if(mode != mode_standby)
standbyMode( true ); standbyMode( true );
} }
if((data & mode_mask)== mode_upnp) {
lastMode=mode;
mode=mode_upnp;
}
if((data & mode_mask)== mode_audio) { if((data & mode_mask)== mode_audio) {
lastMode=mode; lastMode=mode;
mode=mode_audio; mode=mode_audio;