mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

lcd4l: fix moviebrowser handling ...

Browse Source 
* use Movieplayer/Moviebrowser logos
* remove RemoveEventFile()
* rename NewParseID => new_ParseID


Origin commit data
------------------
Branch: ni/coolstream
Commit: c6b51b04ed
Author: vanhofen <vanhofen@gmx.de>
Date: 2022-09-13 (Tue, 13 Sep 2022)

Origin message was:
------------------
- lcd4l: fix moviebrowser handling ...

* use Movieplayer/Moviebrowser logos
* remove RemoveEventFile()
* rename NewParseID => new_ParseID


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2022-09-13 22:48:35 +02:00
parent 1e94e304c3
commit 8954922bef
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/driver/lcd4l.cpp
View File

@@ -245,11 +245,6 @@ int CLCD4l::CreateEventFile(std::string content, bool convert)
return CreateFile(EVENT, content, convert);
}
int CLCD4l::RemoveEventFile()
{
return RemoveFile(EVENT);
}
int CLCD4l::CreateMenuFile(std::string content, bool convert)
{
return CreateFile(MENU, content, convert);
@@ -344,7 +339,7 @@ void *CLCD4l::LCD4lProc(void *arg)
static bool FirstRun = true;
uint64_t p_ParseID = 0;
bool NewParseID = false;
bool new_ParseID = false;
//printf("[CLCD4l] %s: starting loop\n", __FUNCTION__);
while (!PLCD4l->exit_proc)
@@ -367,13 +362,13 @@ void *CLCD4l::LCD4lProc(void *arg)
for (int i = 0; i < 10; i++)
{
usleep(5 * 100 * 1000); // 0.5 sec
NewParseID = PLCD4l->CompareParseID(p_ParseID);
if (NewParseID || p_ParseID == NeutrinoModes::mode_audio)
new_ParseID = PLCD4l->CompareParseID(p_ParseID);
if (new_ParseID || p_ParseID == NeutrinoModes::mode_audio || p_ParseID == NeutrinoModes::mode_moviebrowser)
break;
}
//printf("[CLCD4l] %s: m_ParseID: %llx (NewParseID: %d)\n", __FUNCTION__, p_ParseID, NewParseID ? 1 : 0);
PLCD4l->ParseInfo(p_ParseID, NewParseID, FirstRun);
//printf("[CLCD4l] %s: m_ParseID: %llx (new_ParseID: %d)\n", __FUNCTION__, p_ParseID, new_ParseID ? 1 : 0);
PLCD4l->ParseInfo(p_ParseID, new_ParseID, FirstRun);
if (FirstRun)
{
@@ -789,7 +784,7 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
}
else if (parseID == NeutrinoModes::mode_moviebrowser)
{
Logo = ICONSDIR "/" NEUTRINO_ICON_MOVIEPLAYER ICONSEXT;
g_PicViewer->GetLogoName(0, "Moviebrowser", Logo, &dummy, &dummy, CPictureViewer::LCD4LINUX, true);
Service = g_Locale->getText(LOCALE_MOVIEBROWSER_HEAD);
}
else if (parseID == NeutrinoModes::mode_ts)
@@ -827,8 +822,8 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
else /* show play-icon */
Logo = ICONSDIR "/" NEUTRINO_ICON_PLAY ICONSEXT;
break;
default: /* show movieplayer-icon */
Logo = ICONSDIR "/" NEUTRINO_ICON_MOVIEPLAYER ICONSEXT;
default: /* show movieplayer-logo */
g_PicViewer->GetLogoName(0, "Movieplayer", Logo, &dummy, &dummy, CPictureViewer::LCD4LINUX, true);
}
}
else if (parseID == NeutrinoModes::mode_upnp)
@@ -966,6 +961,8 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
char Start[6] = {0};
char End[6] = {0};
bool writeEvent = true;
if (m_ModeChannel)
{
if (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webradio)
@@ -1089,6 +1086,7 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
else if (parseID == NeutrinoModes::mode_moviebrowser)
{
// do nothing; Event is processed in moviebrowser
writeEvent = false;
}
else if (parseID == NeutrinoModes::mode_ts)
{
@@ -1147,7 +1145,8 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
if (m_Event.compare(Event))
{
WriteFile(EVENT, Event, g_settings.lcd4l_convert);
if (writeEvent)
WriteFile(EVENT, Event, g_settings.lcd4l_convert);
m_Event = Event;
m_ParseID = 0; // reset channelid to get a possible eventlogo