mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-13 08:23:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
[CST] Focus
2012-03-16 14:11:06 +04:00
parent b060b88605 e7f4a0a9cc
commit 68201bad9e
6 changed files with 81 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/channellist.cpp
View File

@@ -146,7 +146,7 @@ void CChannelList::putChannel(CZapitChannel* channel)
{
int num = channel->number - 1;
if(num < 0) {
printf("CChannelList::addChannel error inserting at %d : %s\n", num, channel->name.c_str());
printf("%s error inserting at %d\n", __FUNCTION__, num);
return;
}
if(num >= (int) chanlist.size()) {

9
src/gui/infoviewer.cpp
View File

@@ -111,6 +111,7 @@ void CInfoViewer::Init()
newfreq = true;
chanready = 1;
fileplay = 0;
SDT_freq_update = false;
/* maybe we should not tie this to the blinkenlights settings? */
if (g_settings.casystem_display < 2)
@@ -1538,16 +1539,15 @@ void CInfoViewer::showSNR ()
return;
char percent[10];
uint16_t ssig, ssnr;
/* right now, infobar_show_channellogo == 3 is the trigger for signal bars etc.
TODO: decouple this */
if (! fileplay && ( g_settings.infobar_show_channellogo == 3 || g_settings.infobar_show_channellogo == 5 || g_settings.infobar_show_channellogo == 6 )) {
int chanH = g_SignalFont->getHeight();
int freqStartY = BoxStartY + 2 * chanH - 3;
if (newfreq && chanready) {
if ((newfreq && chanready) || SDT_freq_update) {
char freq[20];
newfreq = false;
CZapitClient::CCurrentServiceInfo si = g_Zapit->getCurrentServiceInfo ();
std::string polarisation;
if (g_info.delivery_system == DVB_S)
@@ -1557,7 +1557,8 @@ void CInfoViewer::showSNR ()
snprintf (freq, sizeof(freq), "%d.%d MHz %s", si.tsfrequency / 1000, si.tsfrequency % 1000, polarisation.c_str());
int satNameWidth = g_SignalFont->getRenderWidth (freq);
g_SignalFont->RenderString (3 + BoxStartX + ((ChanWidth - satNameWidth) / 2), BoxStartY + 2 * chanH - 3, satNameWidth, freq, COL_INFOBAR);
g_SignalFont->RenderString (3 + BoxStartX + ((ChanWidth - satNameWidth) / 2), BoxStartY + 2 * chanH - 3, satNameWidth, freq, SDT_freq_update ? COL_COLORED_EVENTS_INFOBAR:COL_INFOBAR);
SDT_freq_update = false;
}
int sw, snr, sig, posx, posy;

1
src/gui/infoviewer.h
View File

@@ -186,6 +186,7 @@ class CInfoViewer
int handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data);
void clearVirtualZapMode() {virtual_zap_mode = false;}
void changePB();
bool SDT_freq_update;
};
class CInfoViewerHandler : public CMenuTarget