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

Disable zap to different TP from channel list if recording, quick zap still TODO; Dont zap on left/right if virtual zap mode on

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 683ebbab9a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-02-01 (Mon, 01 Feb 2010)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2010-02-01 14:01:22 +00:00
parent 3bd2037362
commit 7e4f834d12
3 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/gui/channellist.cpp
View File

@@ -529,13 +529,13 @@ int CChannelList::show()
selected=0;
liststart = (selected/listmaxshow)*listmaxshow;
paint();
if(new_mode_active) { actzap = true; zapTo(selected); }
if(new_mode_active && SameTP()) { actzap = true; zapTo(selected); }
}
else if (msg == (neutrino_msg_t) g_settings.key_list_end) {
selected=chanlist.size()-1;
liststart = (selected/listmaxshow)*listmaxshow;
paint();
if(new_mode_active) { actzap = true; zapTo(selected); }
if(new_mode_active && SameTP()) { actzap = true; zapTo(selected); }
}
else if (msg == CRCInput::RC_up || (int) msg == g_settings.key_channelList_pageup)
{
@@ -555,7 +555,7 @@ int CChannelList::show()
else
paintItem(selected - liststart);
if(new_mode_active) { actzap = true; zapTo(selected); }
if(new_mode_active && SameTP()) { actzap = true; zapTo(selected); }
//paintHead();
}
else if (msg == CRCInput::RC_down || (int) msg == g_settings.key_channelList_pagedown)
@@ -581,7 +581,7 @@ int CChannelList::show()
else
paintItem(selected - liststart);
if(new_mode_active) { actzap = true; zapTo(selected); }
if(new_mode_active && SameTP()) { actzap = true; zapTo(selected); }
//paintHead();
}
@@ -630,8 +630,10 @@ int CChannelList::show()
}
}
else if ( msg == CRCInput::RC_ok ) {
zapOnExit = true;
loop=false;
if(SameTP()) {
zapOnExit = true;
loop=false;
}
}
else if ( msg == CRCInput::RC_spkr ) {
new_mode_active = (new_mode_active ? 0 : 1);
@@ -1521,7 +1523,7 @@ void CChannelList::paintItem(int pos)
max_desc_len -= 28; /* do we need space for the lock icon? */
if (max_desc_len < 0)
max_desc_len = 0;
if (ch_desc_len > max_desc_len)
if ((int) ch_desc_len > max_desc_len)
ch_desc_len = max_desc_len;
if(g_settings.channellist_extended){
@@ -1678,3 +1680,13 @@ int CChannelList::getSelectedChannelIndex() const
{
return this->selected;
}
bool CChannelList::SameTP()
{
bool iscurrent = true;
if(!autoshift && CNeutrinoApp::getInstance()->recordingstatus )
iscurrent = (chanlist[selected]->channel_id >> 16) == (rec_channel_id >> 16);
return iscurrent;
}