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

Testing list edit problem #249; Commented some not used code

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 42078cdd8f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-02-26 (Fri, 26 Feb 2010)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2010-02-26 17:49:28 +00:00
parent e576469e11
commit 5ae74b3df5
5 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/neutrino.cpp
View File

@@ -199,6 +199,8 @@ int prev_video_mode;
int xres = 72;
int yres = 72; // TODO: no globals for that.
int g_channel_list_changed;
void stop_daemons(bool stopall = true);
// uncomment if you want to have a "test" menue entry (rasc)
@@ -1704,19 +1706,25 @@ void CNeutrinoApp::channelsInit(bool /*bOnly*/)
if(g_settings.make_hd_list)
hdBouquet = new CBouquet(0, (char *) "HD", false);
/* TODO: check, is really needed to have main "all channels" list sorted
according to channel number ? Anything besides
channelList::zapTo(pos) using direct [number] access in list ??
zapTo(pos) used in epgplus.cpp and channellist.cpp
getActiveChannelNumber used to get index for direct access too ?
*/
int tvi = 0, ri = 0, hi = 0;
for (tallchans_iterator it = allchans.begin(); it != allchans.end(); it++) {
if (it->second.getServiceType() == ST_DIGITAL_TELEVISION_SERVICE) {
TVchannelList->putChannel(&(it->second));
tvi++;
#if 1
if(g_settings.make_hd_list)
if(it->second.isHD()) {
//printf("HD channel: %d %s sid %x\n", it->second.getSatellitePosition(), it->second.getName().c_str(), it->second.getServiceId());
hdBouquet->channelList->addChannel(&(it->second));
hi++;
}
#endif
}
else if (it->second.getServiceType() == ST_DIGITAL_RADIO_SOUND_SERVICE) {
RADIOchannelList->putChannel(&(it->second));
@@ -3037,18 +3045,18 @@ _repeat:
nNewChannel = bouquetList->exec(true);
goto _repeat;
}
else if(nNewChannel == -4) {
//else if(nNewChannel == -4)
if(g_channel_list_changed)
{
SetChannelMode(old_mode);
g_channel_list_changed = 0;
if(old_b_id < 0) old_b_id = old_b;
g_Zapit->saveBouquets();
}
if(g_settings.mode_clock)
InfoClock->StartClock();
#if 0
/* FIXME: more check for StartSubtitles() like was no zap ?? */
if(mode == mode_tv)
StartSubtitles();
#endif
return messages_return::handled;
}
}