From e875b962690d6f7c037675a3288f20a61d997855 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 30 Sep 2020 21:07:36 +0200 Subject: [PATCH] lcd4l: show event in webtv/webradio mode Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/bb1086ab9d109a807cbe5ae938bc483f8e9473c2 Author: vanhofen Date: 2020-09-30 (Wed, 30 Sep 2020) Origin message was: ------------------ - lcd4l: show event in webtv/webradio mode ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/lcd4l.cpp | 7 +++++++ src/gui/infoviewer.h | 2 ++ 2 files changed, 9 insertions(+) diff --git a/src/driver/lcd4l.cpp b/src/driver/lcd4l.cpp index 8621eff89..0214fb469 100644 --- a/src/driver/lcd4l.cpp +++ b/src/driver/lcd4l.cpp @@ -48,6 +48,7 @@ #include #include #include +#include #include #include #include @@ -884,6 +885,12 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun) tm_struct = localtime(&next_start_time); snprintf(End, sizeof(End), "%02d:%02d", tm_struct->tm_hour, tm_struct->tm_min); } + + if (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webradio) + { + // FIXME: Doesn't work with timing.infobar_tv/radio=0 + Event = g_InfoViewer->get_livestreamInfo1(); + } } else if (parseID == NeutrinoModes::mode_audio) { diff --git a/src/gui/infoviewer.h b/src/gui/infoviewer.h index 47c8141d8..ba83b3048 100644 --- a/src/gui/infoviewer.h +++ b/src/gui/infoviewer.h @@ -213,6 +213,8 @@ class CInfoViewer : public sigc::trackable int getSwitchMode() {return zap_mode;} void resetSwitchMode() {setSwitchMode(IV_MODE_DEFAULT);} + std::string get_livestreamInfo1() { return _livestreamInfo1; } + void changePB(); void ResetPB(); void showSNR();