From 1e6ae2fc767d3288b29db610effc18bacc7785a5 Mon Sep 17 00:00:00 2001 From: gixxpunk Date: Sun, 11 Mar 2012 20:45:40 +0000 Subject: [PATCH 1/5] cables.xml - update FAKS git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2146 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/90ad2a9a2351315fc984a52467011763f036f91a Author: gixxpunk Date: 2012-03-11 (Sun, 11 Mar 2012) Origin message was: ------------------ - cables.xml - update FAKS git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2146 e54a6e83-5905-42d5-8d5c-058d10e6a962 ------------------ This commit was generated by Migit --- data/cables.xml | 52 +++++++++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/data/cables.xml b/data/cables.xml index e3963efc7..79235471a 100644 --- a/data/cables.xml +++ b/data/cables.xml @@ -390,28 +390,42 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + From 158b46fa95ef01dc85397b6832b4e7d45cc6206c Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 15 Mar 2012 07:41:35 +0000 Subject: [PATCH 2/5] cables.xml: update Goetzschtalbruecke git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2147 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/6b4883f29579b59abef3950b96f8ee65190d5bd3 Author: vanhofen Date: 2012-03-15 (Thu, 15 Mar 2012) Origin message was: ------------------ - cables.xml: update Goetzschtalbruecke git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2147 e54a6e83-5905-42d5-8d5c-058d10e6a962 ------------------ This commit was generated by Migit --- data/cables.xml | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/data/cables.xml b/data/cables.xml index 79235471a..f56dd0ef2 100644 --- a/data/cables.xml +++ b/data/cables.xml @@ -461,6 +461,20 @@ + + + + + + + + + + + + + + @@ -477,22 +491,16 @@ + + + - - - - - - - - - - - - - - - + + + + + + From 3df5f3075aaeb6525173f37e717f859b43229b04 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Thu, 15 Mar 2012 08:24:43 +0000 Subject: [PATCH 3/5] Fix error message in CChannelList::putChannel git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2148 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/f13a3203af360fddbbfc70402f71caa744daf329 Author: Michael Liebmann Date: 2012-03-15 (Thu, 15 Mar 2012) Origin message was: ------------------ * Fix error message in CChannelList::putChannel git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2148 e54a6e83-5905-42d5-8d5c-058d10e6a962 ------------------ This commit was generated by Migit --- src/gui/channellist.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 0be534ecc..9bf59ec4c 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -145,7 +145,7 @@ void CChannelList::putChannel(CZapitChannel* channel) { int num = channel->number - 1; if(num < 0) { - printf("CChannelList::addChannel error inserting at %d\n", num); + printf("%s error inserting at %d\n", __FUNCTION__, num); return; } if(num >= (int) chanlist.size()) { From e55dbb73364d128640cb2865ffa85d87ae883127 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Thu, 15 Mar 2012 14:26:43 +0000 Subject: [PATCH 4/5] show Saving EPG info on CVFD git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2149 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/0167d227b2ffdc0a503d414f41d3680afb4932bd Author: Jacek Jendrzej Date: 2012-03-15 (Thu, 15 Mar 2012) ------------------ This commit was generated by Migit --- src/neutrino.cpp | 16 ++++++++++++---- src/neutrino.h | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index ac10ac853..4d2beff48 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2911,7 +2911,7 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode) videoDecoder->ShowPicture(DATADIR "/neutrino/icons/shutdown.jpg"); if(g_settings.epg_save /* && timeset && g_Sectionsd->getIsTimeSet ()*/) { - saveEpg(); + saveEpg(true);// true CVFD::MODE_SHUTDOWN } stop_daemons(retcode);//need here for timer_is_rec before saveSetup @@ -3052,18 +3052,26 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode) } } -void CNeutrinoApp::saveEpg() +void CNeutrinoApp::saveEpg(bool cvfd_mode) { struct stat my_stat; if(stat(g_settings.epg_dir.c_str(), &my_stat) == 0){ - printf("Saving EPG to %s....\n", g_settings.epg_dir.c_str()); + const char *save_txt = "Saving EPG"; + printf("%s to %s....\n",save_txt, g_settings.epg_dir.c_str()); neutrino_msg_t msg; neutrino_msg_data_t data; + + CVFD::getInstance()->Clear(); + CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); + CVFD::getInstance ()->ShowText(save_txt); + g_Sectionsd->writeSI2XML(g_settings.epg_dir.c_str()); while( true ) { g_RCInput->getMsg(&msg, &data, 1200); // 120 secs.. if (( msg == CRCInput::RC_timeout ) || (msg == NeutrinoMessages::EVT_SI_FINISHED)) { //printf("Msg %x timeout %d EVT_SI_FINISHED %x\n", msg, CRCInput::RC_timeout, NeutrinoMessages::EVT_SI_FINISHED); + CVFD::getInstance()->Clear(); + CVFD::getInstance()->setMode(cvfd_mode ? CVFD::MODE_SHUTDOWN : CVFD::MODE_STANDBY);// true CVFD::MODE_SHUTDOWN , false CVFD::MODE_STANDBY break; } } @@ -3359,7 +3367,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff ) if(!CRecordManager::getInstance()->RecordingStatus()) { //only save epg when not recording if(g_settings.epg_save) { - saveEpg(); + saveEpg(false);//false CVFD::MODE_STANDBY } } diff --git a/src/neutrino.h b/src/neutrino.h index 117a7ae90..8c732fb85 100644 --- a/src/neutrino.h +++ b/src/neutrino.h @@ -156,7 +156,7 @@ private: void standbyMode( bool bOnOff ); void AudioMute( int newValue, bool isEvent= false ); void setvol(int vol); - void saveEpg(); + void saveEpg(bool cvfd_mode); void ExitRun(const bool write_si = true, int retcode = 0); void RealRun(CMenuWidget &mainSettings); From b1386e14c7869b3743b02cc4b8d0fee033bba658 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Thu, 15 Mar 2012 18:06:22 +0000 Subject: [PATCH 5/5] show infobar with colored freq after SDT freq update git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2150 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/e7f4a0a9ccba2cc9f34bac1cd317fb2e535f49d8 Author: Jacek Jendrzej Date: 2012-03-15 (Thu, 15 Mar 2012) ------------------ This commit was generated by Migit --- src/gui/infoviewer.cpp | 9 +++++---- src/gui/infoviewer.h | 1 + src/neutrino.cpp | 5 +++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index aed99efb0..a77f767b4 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -116,6 +116,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) @@ -1533,16 +1534,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) @@ -1552,7 +1552,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; int height; diff --git a/src/gui/infoviewer.h b/src/gui/infoviewer.h index 9e4adb5a6..7039708e7 100644 --- a/src/gui/infoviewer.h +++ b/src/gui/infoviewer.h @@ -185,6 +185,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 diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 4d2beff48..b8d68d432 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2870,6 +2870,11 @@ _repeat: } else if (msg == NeutrinoMessages::EVT_SERVICES_UPD) { SDTreloadChannels = true; + g_InfoViewer->SDT_freq_update = true; + if( !g_InfoViewer->is_visible && !autoshift){ + g_RCInput->postMsg(NeutrinoMessages::SHOW_INFOBAR , 0); + } + return messages_return::handled; // ShowHintUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_EXTRA_ZAPIT_SDT_CHANGED), // CMessageBox::mbrBack,CMessageBox::mbBack, NEUTRINO_ICON_INFO); }