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

neutrino: make g_channel_list_changed private

Browse Source 
Add a setter function MarkChannelListChanged() instead for
bouquet/channel list. This avoids sometimes not reloading
channels after changes in the service menu.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 744ed878de
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-04-14 19:42:28 +02:00
parent 4ebca28540
commit d241584369
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/bouquetlist.cpp
View File

@@ -424,7 +424,7 @@ int CBouquetList::show(bool bShowChannelList)
if (!Bouquets.empty()) { if (!Bouquets.empty()) {
int ret = doMenu(); int ret = doMenu();
if(ret > 0) { if(ret > 0) {
CNeutrinoApp::getInstance ()->g_channel_list_changed = true; CNeutrinoApp::getInstance()->MarkChannelListChanged();
res = -4; res = -4;
loop = false; loop = false;
} else if(ret < 0) } else if(ret < 0)

3
src/gui/channellist.cpp
View File

@@ -710,7 +710,8 @@ int CChannelList::show()
old_b_id = bouquetList->getActiveBouquetNumber(); old_b_id = bouquetList->getActiveBouquetNumber();
fader.Stop(); fader.Stop();
int ret = doChannelMenu(); int ret = doChannelMenu();
CNeutrinoApp::getInstance()->g_channel_list_changed = (ret != 0); if (ret != 0)
CNeutrinoApp::getInstance()->MarkChannelListChanged();
if (ret == 1) { if (ret == 1) {
res = -3 - ret; /* -5 == add to fav or bouquet, -4 == all other change */ res = -3 - ret; /* -5 == add to fav or bouquet, -4 == all other change */
loop = false; loop = false;

4
src/neutrino.cpp
View File

@@ -214,7 +214,7 @@ CNeutrinoApp::CNeutrinoApp()
lockStandbyCall = false; lockStandbyCall = false;
current_muted = 0; current_muted = 0;
recordingstatus = 0; recordingstatus = 0;
g_channel_list_changed = 0; g_channel_list_changed = false;
memset(&font, 0, sizeof(neutrino_font_descr_struct)); memset(&font, 0, sizeof(neutrino_font_descr_struct));
} }
@@ -2493,7 +2493,7 @@ _repeat:
/* don't change bouquet after adding a channel to favorites */ /* don't change bouquet after adding a channel to favorites */
if (nNewChannel != -5) if (nNewChannel != -5)
SetChannelMode(old_mode); SetChannelMode(old_mode);
g_channel_list_changed = 0; g_channel_list_changed = false;
if(old_b_id < 0) old_b_id = old_b; if(old_b_id < 0) old_b_id = old_b;
//g_Zapit->saveBouquets(); //g_Zapit->saveBouquets();
/* lets do it in sync */ /* lets do it in sync */

3
src/neutrino.h
View File

@@ -121,6 +121,7 @@ private:
bool skipSleepTimer; bool skipSleepTimer;
bool lockStandbyCall; bool lockStandbyCall;
bool pbBlinkChange; bool pbBlinkChange;
bool g_channel_list_changed;
int tvsort[LIST_MODE_LAST]; int tvsort[LIST_MODE_LAST];
int radiosort[LIST_MODE_LAST]; int radiosort[LIST_MODE_LAST];
@@ -219,6 +220,7 @@ public:
return lastChannelMode; return lastChannelMode;
}; };
void SetChannelMode(int mode); void SetChannelMode(int mode);
void MarkChannelListChanged(void) { g_channel_list_changed = true; };
void quickZap(int msg); void quickZap(int msg);
void numericZap(int msg); void numericZap(int msg);
void StopSubtitles(); void StopSubtitles();
@@ -227,7 +229,6 @@ public:
void showInfo(void); void showInfo(void);
CConfigFile* getConfigFile() {return &configfile;}; CConfigFile* getConfigFile() {return &configfile;};
bool SDTreloadChannels; bool SDTreloadChannels;
bool g_channel_list_changed;
}; };
#endif #endif