From 080406f9126d49e7026677e5a3588b4f2fd4ce13 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 12 Apr 2023 23:13:55 +0200 Subject: [PATCH] infoviewer: an addition to e415a8feb2a652b634db25ca2cda5fb8f39ba5eb Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/0c2e7fb3b06f0e01494122fb052429637e460e67 Author: vanhofen Date: 2023-04-12 (Wed, 12 Apr 2023) Origin message was: ------------------ - infoviewer: an addition to e415a8feb2a652b634db25ca2cda5fb8f39ba5eb ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/glcd/glcd.cpp | 2 +- src/driver/lcd4l.cpp | 2 +- src/gui/infoviewer.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/driver/glcd/glcd.cpp b/src/driver/glcd/glcd.cpp index 8dcc118d1..d9e4becee 100644 --- a/src/driver/glcd/glcd.cpp +++ b/src/driver/glcd/glcd.cpp @@ -1162,7 +1162,7 @@ void cGLCD::Run(void) if (Epg.empty() && (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webradio)) { - g_InfoViewer->get_livestreamInfo(); + g_InfoViewer->init_livestreamInfo(); if (g_InfoViewer->get_livestreamInfo1() == "RESOLUTION=1x1") // comes from best_bitrate_m3u8.lua Epg = g_InfoViewer->get_livestreamInfo2(); else diff --git a/src/driver/lcd4l.cpp b/src/driver/lcd4l.cpp index 6d23c1039..9ce86f1f2 100644 --- a/src/driver/lcd4l.cpp +++ b/src/driver/lcd4l.cpp @@ -975,7 +975,7 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun) { if (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webradio) { - g_InfoViewer->get_livestreamInfo(); + g_InfoViewer->init_livestreamInfo(); if (g_InfoViewer->get_livestreamInfo1() == "RESOLUTION=1x1") // comes from best_bitrate_m3u8.lua { Event = g_InfoViewer->get_livestreamInfo2(); diff --git a/src/gui/infoviewer.h b/src/gui/infoviewer.h index 71cc01dce..690d84dc0 100644 --- a/src/gui/infoviewer.h +++ b/src/gui/infoviewer.h @@ -217,7 +217,7 @@ class CInfoViewer : public sigc::trackable int getSwitchMode() {return zap_mode;} void resetSwitchMode() {setSwitchMode(IV_MODE_DEFAULT);} - void get_livestreamInfo() { initLiveStreamInfo(); } + void init_livestreamInfo() { initLiveStreamInfo(); } std::string get_livestreamInfo1() { return _livestreamInfo1; } std::string get_livestreamInfo2() { return _livestreamInfo2; }