mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-26 23:13:00 +02:00
glcd: fix livestreamInfo
Origin commit data
------------------
Branch: ni/coolstream
Commit: e4f68aa554
Author: vanhofen <vanhofen@gmx.de>
Date: 2023-03-26 (Sun, 26 Mar 2023)
Origin message was:
------------------
- glcd: fix livestreamInfo
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -32,6 +32,7 @@
|
|||||||
#include <system/helpers.h>
|
#include <system/helpers.h>
|
||||||
#include <system/set_threadname.h>
|
#include <system/set_threadname.h>
|
||||||
#include <driver/audioplay.h>
|
#include <driver/audioplay.h>
|
||||||
|
#include <gui/infoviewer.h>
|
||||||
#include <gui/movieplayer.h>
|
#include <gui/movieplayer.h>
|
||||||
#include <driver/pictureviewer/pictureviewer.h>
|
#include <driver/pictureviewer/pictureviewer.h>
|
||||||
#include <hardware_caps.h>
|
#include <hardware_caps.h>
|
||||||
@@ -1158,6 +1159,25 @@ void cGLCD::Run(void)
|
|||||||
snprintf(tmp_end, sizeof(tmp_end), "%02d:%02d", tm->tm_hour, tm->tm_min);
|
snprintf(tmp_end, sizeof(tmp_end), "%02d:%02d", tm->tm_hour, tm->tm_min);
|
||||||
End = stagingEnd = tmp_end;
|
End = stagingEnd = tmp_end;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (Epg.empty() && (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webradio))
|
||||||
|
{
|
||||||
|
g_InfoViewer->get_livestreamInfo();
|
||||||
|
if (g_InfoViewer->get_livestreamInfo1() == "RESOLUTION=1x1") // comes from best_bitrate_m3u8.lua
|
||||||
|
Epg = g_InfoViewer->get_livestreamInfo2();
|
||||||
|
else
|
||||||
|
Epg = g_InfoViewer->get_livestreamInfo1() + " " + g_InfoViewer->get_livestreamInfo2();
|
||||||
|
EpgWidth = font_epg.Width(Epg);
|
||||||
|
doScrollEpg = EpgWidth > bitmap->Width();
|
||||||
|
scrollEpgForward = true;
|
||||||
|
scrollEpgSkip = 0;
|
||||||
|
if (doScrollEpg)
|
||||||
|
{
|
||||||
|
scrollEpgOffset = bitmap->Width()/4;
|
||||||
|
EpgWidth += scrollEpgOffset;
|
||||||
|
} else
|
||||||
|
scrollEpgOffset = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user