mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

- lcd4l: fix eventinfo for webtv/radio

Browse Source 
commit based upon:
c1a45defc6

lcd4linux: not showing 'RESOULUTION=1x1' at streams

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-09-11 21:24:36 +02:00
committed by Thilo Graf
parent 04db884e8a
commit 5ed088afd7
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/driver/lcd4l.cpp
View File

@@ -903,6 +903,20 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
if (m_ModeChannel) 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; t_channel_id channel_id = parseID & 0xFFFFFFFFFFFFULL;
CZapitChannel *channel = CZapit::getInstance()->GetCurrentChannel(); 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); tm_struct = localtime(&next_start_time);
snprintf(End, sizeof(End), "%02d:%02d", tm_struct->tm_hour, tm_struct->tm_min); 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) else if (parseID == NeutrinoModes::mode_audio)
{ {

1
src/gui/infoviewer.h
View File

@@ -203,6 +203,7 @@ class CInfoViewer : public sigc::trackable
void resetSwitchMode() {setSwitchMode(IV_MODE_DEFAULT);} void resetSwitchMode() {setSwitchMode(IV_MODE_DEFAULT);}
std::string get_livestreamInfo1() { return _livestreamInfo1; } std::string get_livestreamInfo1() { return _livestreamInfo1; }
std::string get_livestreamInfo2() { return _livestreamInfo2; }
void changePB(); void changePB();
void ResetPB(); void ResetPB();