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

some dead assignment

Browse Source 
Origin commit data
------------------
Commit: 0ed24632b7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-12-29 (Thu, 29 Dec 2016)
This commit is contained in:
Jacek Jendrzej
2016-12-29 18:41:25 +01:00
parent 73efa6256b
commit bffd81375a
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/channellist.cpp
View File

@@ -1981,7 +1981,6 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
if (frameBuffer->paintIcon(record_icon, icon_x_right - icon_w, ypos, fheight)) if (frameBuffer->paintIcon(record_icon, icon_x_right - icon_w, ypos, fheight))
{ {
offset_right += icon_w + OFFSET_INNER_MID; offset_right += icon_w + OFFSET_INNER_MID;
icon_x_right -= icon_w + OFFSET_INNER_MID;
} }
} }

22
src/neutrino.cpp
View File

@@ -1497,9 +1497,6 @@ void CNeutrinoApp::channelsInit(bool bOnly)
RADIObouquetList = new CBouquetList(g_Locale->getText(LOCALE_CHANNELLIST_PROVS)); RADIObouquetList = new CBouquetList(g_Locale->getText(LOCALE_CHANNELLIST_PROVS));
RADIOfavList = new CBouquetList(g_Locale->getText(LOCALE_CHANNELLIST_FAVS)); RADIOfavList = new CBouquetList(g_Locale->getText(LOCALE_CHANNELLIST_FAVS));
uint32_t i;
i = 1;
int tvi = 0, ri = 0; int tvi = 0, ri = 0;
ZapitChannelList zapitList, webtvList; ZapitChannelList zapitList, webtvList;
@@ -1627,7 +1624,7 @@ void CNeutrinoApp::channelsInit(bool bOnly)
/* Favorites and providers bouquets */ /* Favorites and providers bouquets */
tvi = ri = 0; tvi = ri = 0;
if(g_bouquetManager){ if(g_bouquetManager){
for (i = 0; i < g_bouquetManager->Bouquets.size(); i++) { for (uint32_t i = 0; i < g_bouquetManager->Bouquets.size(); i++) {
CZapitBouquet *b = g_bouquetManager->Bouquets[i]; CZapitBouquet *b = g_bouquetManager->Bouquets[i];
if (!b->bHidden) { if (!b->bHidden) {
if (b->getTvChannels(zapitList) || (g_settings.show_empty_favorites && b->bUser)) { if (b->getTvChannels(zapitList) || (g_settings.show_empty_favorites && b->bUser)) {
@@ -2033,7 +2030,7 @@ TIMER_START();
if (loadLocale_ret == CLocaleManager::NO_SUCH_LOCALE) if (loadLocale_ret == CLocaleManager::NO_SUCH_LOCALE)
{ {
g_settings.language = "english"; g_settings.language = "english";
loadLocale_ret = g_Locale->loadLocale(g_settings.language.c_str()); g_Locale->loadLocale(g_settings.language.c_str());
show_startwizard = true; show_startwizard = true;
} }
@@ -2772,7 +2769,7 @@ void CNeutrinoApp::zapTo(t_channel_id channel_id)
{ {
bool recordingStatus = CRecordManager::getInstance()->RecordingStatus(channel_id); bool recordingStatus = CRecordManager::getInstance()->RecordingStatus(channel_id);
if (!recordingStatus || (recordingStatus && CRecordManager::getInstance()->TimeshiftOnly()) || if (!recordingStatus || (recordingStatus && CRecordManager::getInstance()->TimeshiftOnly()) ||
(recordingStatus && channelList->SameTP(channel_id))) { (recordingStatus && channelList && channelList->SameTP(channel_id))) {
dvbsub_stop(); dvbsub_stop();
g_Zapit->zapTo_serviceID_NOWAIT(channel_id); g_Zapit->zapTo_serviceID_NOWAIT(channel_id);
@@ -2807,7 +2804,8 @@ void CNeutrinoApp::standbyToStandby(void)
t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID(); t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID();
if (standby_channel_id && (live_channel_id != standby_channel_id)) { if (standby_channel_id && (live_channel_id != standby_channel_id)) {
live_channel_id = standby_channel_id; live_channel_id = standby_channel_id;
channelList->zapTo_ChannelID(live_channel_id); if(channelList)
channelList->zapTo_ChannelID(live_channel_id);
} }
g_Zapit->setStandby(true); g_Zapit->setStandby(true);
g_Sectionsd->setPauseScanning(true); g_Sectionsd->setPauseScanning(true);
@@ -3221,7 +3219,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
CTimerd::EventInfo * eventinfo = (CTimerd::EventInfo *) data; CTimerd::EventInfo * eventinfo = (CTimerd::EventInfo *) data;
if (eventinfo->channel_id != CZapit::getInstance()->GetCurrentChannelID()){ if (eventinfo->channel_id != CZapit::getInstance()->GetCurrentChannelID()){
if( (recordingstatus == 0) || (recordingstatus && CRecordManager::getInstance()->TimeshiftOnly()) || if( (recordingstatus == 0) || (recordingstatus && CRecordManager::getInstance()->TimeshiftOnly()) ||
(recordingstatus && channelList->SameTP(eventinfo->channel_id)) ) { (recordingstatus && channelList && channelList->SameTP(eventinfo->channel_id)) ) {
bool isTVMode = CServiceManager::getInstance()->IsChannelTVChannel(eventinfo->channel_id); bool isTVMode = CServiceManager::getInstance()->IsChannelTVChannel(eventinfo->channel_id);
dvbsub_stop(); dvbsub_stop();
@@ -3232,7 +3230,9 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
else if (isTVMode && (mode != mode_tv) && (mode != mode_webtv)) { else if (isTVMode && (mode != mode_tv) && (mode != mode_webtv)) {
tvMode(true); tvMode(true);
} }
channelList->zapTo_ChannelID(eventinfo->channel_id);
if(channelList)
channelList->zapTo_ChannelID(eventinfo->channel_id);
} }
} }
delete[] (unsigned char*) data; delete[] (unsigned char*) data;
@@ -4762,7 +4762,7 @@ bool CNeutrinoApp::adjustToChannelID(const t_channel_id channel_id)
if(!has_channel && old_mode == LIST_MODE_SAT) if(!has_channel && old_mode == LIST_MODE_SAT)
new_mode = LIST_MODE_ALL; new_mode = LIST_MODE_ALL;
has_channel = TVallList->adjustToChannelID(channel_id); TVallList->adjustToChannelID(channel_id);
} }
else if(CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_radio) { else if(CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_radio) {
has_channel = RADIOfavList->adjustToChannelID(channel_id); has_channel = RADIOfavList->adjustToChannelID(channel_id);
@@ -4789,7 +4789,7 @@ bool CNeutrinoApp::adjustToChannelID(const t_channel_id channel_id)
if(!has_channel && old_mode == LIST_MODE_SAT) if(!has_channel && old_mode == LIST_MODE_SAT)
new_mode = LIST_MODE_ALL; new_mode = LIST_MODE_ALL;
has_channel = RADIOallList->adjustToChannelID(channel_id); RADIOallList->adjustToChannelID(channel_id);
} }
if(old_mode != new_mode) if(old_mode != new_mode)
CNeutrinoApp::getInstance()->SetChannelMode(new_mode); CNeutrinoApp::getInstance()->SetChannelMode(new_mode);