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

channellist: avoid switching bouquets in zaphistory/current_transponder mode

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 12a67c5cdf
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-03-21 (Wed, 21 Mar 2018)

Origin message was:
------------------
- channellist: avoid switching bouquets in zaphistory/current_transponder mode

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-03-21 00:45:21 +01:00
parent 319dadfadc
commit a11ed4ffe9
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/channellist.cpp
View File

@@ -134,6 +134,7 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
move_state = beDefault; move_state = beDefault;
edit_state = false; edit_state = false;
channelsChanged = false; channelsChanged = false;
liveBouquet = false;
paint_events_index = -2; paint_events_index = -2;
CFrameBuffer::getInstance()->OnAfterSetPallette.connect(sigc::mem_fun(this, &CChannelList::ResetModules)); CFrameBuffer::getInstance()->OnAfterSetPallette.connect(sigc::mem_fun(this, &CChannelList::ResetModules));
@@ -754,8 +755,8 @@ int CChannelList::show()
if (new_selected >= 0) if (new_selected >= 0)
actzap = updateSelection(new_selected); actzap = updateSelection(new_selected);
} }
else if (!edit_state && (msg == (neutrino_msg_t)g_settings.key_bouquet_up || else if (!edit_state && !liveBouquet &&
msg == (neutrino_msg_t)g_settings.key_bouquet_down)) { (msg == (neutrino_msg_t)g_settings.key_bouquet_up || msg == (neutrino_msg_t)g_settings.key_bouquet_down)) {
if (dline) if (dline)
dline->kill(); //kill details line on change to next page dline->kill(); //kill details line on change to next page
if (!bouquetList->Bouquets.empty()) { if (!bouquetList->Bouquets.empty()) {
@@ -1272,6 +1273,7 @@ int CChannelList::numericZap(int key)
if (this->lastChList.size() > 1) if (this->lastChList.size() > 1)
{ {
CChannelList * channelList = new CChannelList(g_Locale->getText(LOCALE_CHANNELLIST_HISTORY), true, true); CChannelList * channelList = new CChannelList(g_Locale->getText(LOCALE_CHANNELLIST_HISTORY), true, true);
channelList->setLiveBouquet();
for (unsigned int i = 1; i < this->lastChList.size(); ++i) for (unsigned int i = 1; i < this->lastChList.size(); ++i)
{ {
@@ -1302,6 +1304,7 @@ int CChannelList::numericZap(int key)
{ {
CChannelList * orgList = CNeutrinoApp::getInstance()->channelList; CChannelList * orgList = CNeutrinoApp::getInstance()->channelList;
CChannelList * channelList = new CChannelList(g_Locale->getText(LOCALE_CHANNELLIST_CURRENT_TP), false, true); CChannelList * channelList = new CChannelList(g_Locale->getText(LOCALE_CHANNELLIST_CURRENT_TP), false, true);
channelList->setLiveBouquet();
t_channel_id recid = (*chanlist)[selected]->getChannelID() >> 16; t_channel_id recid = (*chanlist)[selected]->getChannelID() >> 16;
for (unsigned int i = 0; i < (*orgList->chanlist).size(); i++) for (unsigned int i = 0; i < (*orgList->chanlist).size(); i++)

2
src/gui/channellist.h
View File

@@ -84,6 +84,7 @@ private:
unsigned int origPosition; unsigned int origPosition;
unsigned int newPosition; unsigned int newPosition;
bool channelsChanged; bool channelsChanged;
bool liveBouquet;
unsigned int tuned; unsigned int tuned;
t_channel_id selected_chid; t_channel_id selected_chid;
@@ -236,6 +237,7 @@ public:
CLastChannel & getLastChannels() { return lastChList; } CLastChannel & getLastChannels() { return lastChList; }
bool showEmptyError(); bool showEmptyError();
int getSelected() { return selected; } int getSelected() { return selected; }
void setLiveBouquet(bool state = true) { liveBouquet = state; };
CZapitChannel* getPrevNextChannel(int key, unsigned int &sl); CZapitChannel* getPrevNextChannel(int key, unsigned int &sl);
//friend class CZapitChannel; //friend class CZapitChannel;
enum enum