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

fix new_mode(spkr) zap in channellist

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1231 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: e045569027
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-02-27 (Sun, 27 Feb 2011)

Origin message was:
------------------
-fix new_mode(spkr) zap in channellist

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1231 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2011-02-27 22:26:04 +00:00
parent 0f12a3320e
commit a4d3800465
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/channellist.cpp
View File

@@ -98,6 +98,7 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
frameBuffer = CFrameBuffer::getInstance(); frameBuffer = CFrameBuffer::getInstance();
name = pName; name = pName;
selected = 0; selected = 0;
selected_in_new_mode = 0;
liststart = 0; liststart = 0;
tuned=0xfffffff; tuned=0xfffffff;
zapProtection = NULL; zapProtection = NULL;
@@ -557,9 +558,15 @@ int CChannelList::show()
} }
} }
else if ( ( msg == CRCInput::RC_timeout ) || ( msg == (neutrino_msg_t)g_settings.key_channelList_cancel) ) { else if ( ( msg == CRCInput::RC_timeout ) || ( msg == (neutrino_msg_t)g_settings.key_channelList_cancel) ) {
if(!actzap)
selected = oldselected;
res = -1; res = -1;
if(!actzap){
selected = oldselected;
}
else{
res = -4;
selected = selected_in_new_mode;
}
if ( fadeIn ) { if ( fadeIn ) {
g_RCInput->killTimer(fadeTimer); g_RCInput->killTimer(fadeTimer);
fadeTimer = 0; fadeTimer = 0;
@@ -1054,6 +1061,13 @@ printf("**************************** CChannelList::zapTo me %p %s tuned %d new %
if ( pos!=(int)tuned ) { if ( pos!=(int)tuned ) {
tuned = pos; tuned = pos;
g_RemoteControl->zapTo_ChannelID(chan->channel_id, chan->name, !chan->bAlwaysLocked); // UTF-8 g_RemoteControl->zapTo_ChannelID(chan->channel_id, chan->name, !chan->bAlwaysLocked); // UTF-8
// TODO check is it possible bouquetList is NULL ?
if (bouquetList != NULL) {
CNeutrinoApp::getInstance()->channelList->adjustToChannelID(chan->channel_id);
}
if(this->new_mode_active)
selected_in_new_mode = pos;
} }
if(!this->new_mode_active) { if(!this->new_mode_active) {
selected = pos; selected = pos;
@@ -1067,10 +1081,6 @@ printf("**************************** CChannelList::zapTo me %p %s tuned %d new %
g_InfoViewer->handleMsg(NeutrinoMessages::EVT_RECORDMODE, 0); g_InfoViewer->handleMsg(NeutrinoMessages::EVT_RECORDMODE, 0);
} }
// TODO check is it possible bouquetList is NULL ?
if (bouquetList != NULL) {
CNeutrinoApp::getInstance()->channelList->adjustToChannelID(chan->channel_id);
}
g_RCInput->postMsg( NeutrinoMessages::SHOW_INFOBAR, 0 ); g_RCInput->postMsg( NeutrinoMessages::SHOW_INFOBAR, 0 );
} }
} }

2
src/gui/channellist.h
View File

@@ -55,7 +55,7 @@ class CChannelList
{ {
private: private:
CFrameBuffer *frameBuffer; CFrameBuffer *frameBuffer;
unsigned int selected; unsigned int selected, selected_in_new_mode;
t_channel_id selected_chid; t_channel_id selected_chid;
CLastChannel lastChList; CLastChannel lastChList;
unsigned int liststart; unsigned int liststart;