From 5ed088afd7c89dfe08ddd5106456ff49ba9936c1 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Sat, 11 Sep 2021 21:24:36 +0200 Subject: [PATCH] - lcd4l: fix eventinfo for webtv/radio commit based upon: https://github.com/Duckbox-Developers/neutrino-ddt/commit/c1a45defc69129b6d168788b50bbf8fdfacb72b8 lcd4linux: not showing 'RESOULUTION=1x1' at streams Signed-off-by: Thilo Graf --- src/driver/lcd4l.cpp | 20 ++++++++++++++------ src/gui/infoviewer.h | 1 + 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/driver/lcd4l.cpp b/src/driver/lcd4l.cpp index f1796f45c..6c6322c72 100644 --- a/src/driver/lcd4l.cpp +++ b/src/driver/lcd4l.cpp @@ -903,6 +903,20 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun) if (m_ModeChannel) { + if (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webradio) + { + // FIXME: Doesn't work with timing.infobar_tv/radio=0 + if (g_InfoViewer->get_livestreamInfo1() == "RESOLUTION=1x1") // comes from best_bitrate_m3u8.lua + { + Event = g_InfoViewer->get_livestreamInfo2(); + } + else + { + Event = g_InfoViewer->get_livestreamInfo1(); + Event += "\n" + g_InfoViewer->get_livestreamInfo2(); + } + } + t_channel_id channel_id = parseID & 0xFFFFFFFFFFFFULL; CZapitChannel *channel = CZapit::getInstance()->GetCurrentChannel(); @@ -952,12 +966,6 @@ 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 caca5dfb4..ea3585f03 100644 --- a/src/gui/infoviewer.h +++ b/src/gui/infoviewer.h @@ -203,6 +203,7 @@ class CInfoViewer : public sigc::trackable void resetSwitchMode() {setSwitchMode(IV_MODE_DEFAULT);} std::string get_livestreamInfo1() { return _livestreamInfo1; } + std::string get_livestreamInfo2() { return _livestreamInfo2; } void changePB(); void ResetPB();