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

epgview: fix switch back from movie database view

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d56e7e810d
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-09-24 (Fri, 24 Sep 2021)

Origin message was:
------------------
- epgview: fix switch back from movie database view

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2021-09-24 22:52:05 +02:00
parent ed97434fbf
commit 1dc37e309c
1 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gui/epgview.cpp
View File

@@ -1187,10 +1187,16 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
// imdb/omdb info and tmdb info // imdb/omdb info and tmdb info
case CRCInput::RC_green: case CRCInput::RC_green:
{ {
bool omdb_start = false; bool imdb_start = false;
bool tmdb_start = false; bool tmdb_start = false;
if (g_settings.omdb_enabled && g_settings.tmdb_enabled) if (g_settings.omdb_enabled && g_settings.tmdb_enabled)
{
if (imdb_active)
imdb_start = true;
else if (tmdb_active)
tmdb_start = true;
else
{ {
CMsgBox msgBox(g_Locale->getText(LOCALE_MDB_CHOOSE), LOCALE_MDB_HEAD); CMsgBox msgBox(g_Locale->getText(LOCALE_MDB_CHOOSE), LOCALE_MDB_HEAD);
msgBox.setShowedButtons(CMsgBox::mbNo | CMsgBox::mbYes); msgBox.setShowedButtons(CMsgBox::mbNo | CMsgBox::mbYes);
@@ -1203,7 +1209,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
switch (msgBox.getResult()) switch (msgBox.getResult())
{ {
case CMsgBox::mbrNo: // imdb case CMsgBox::mbrNo: // imdb
omdb_start = true; imdb_start = true;
break; break;
case CMsgBox::mbrYes: // tmdb case CMsgBox::mbrYes: // tmdb
tmdb_start = true; tmdb_start = true;
@@ -1212,14 +1218,15 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
break; break;
} }
} }
}
else if (g_settings.omdb_enabled) else if (g_settings.omdb_enabled)
omdb_start = true; imdb_start = true;
else if (g_settings.tmdb_enabled) else if (g_settings.tmdb_enabled)
tmdb_start = true; tmdb_start = true;
else else
break; break;
if (omdb_start) if (imdb_start)
{ {
if (tmdb_active) if (tmdb_active)
{ {
@@ -1256,6 +1263,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
epgText = epgText_saved; epgText = epgText_saved;
textCount = epgText.size(); textCount = epgText.size();
showText(showPos, sy + toph); showText(showPos, sy + toph);
showTimerEventBar(true, !mp_info && isCurrentEPG(channel_id), mp_info); //show buttons
} }
} }
else if (tmdb_start) else if (tmdb_start)
@@ -1264,7 +1272,6 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
{ {
imdb_active = false; imdb_active = false;
imdb_stars = 0; imdb_stars = 0;
showTimerEventBar(true, !mp_info && isCurrentEPG(channel_id), mp_info); //show buttons
epgText = epgText_saved; epgText = epgText_saved;
textCount = epgText.size(); textCount = epgText.size();
} }
@@ -1283,6 +1290,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
processTextToArray(tmdb->getEPGText(), 0, tmdb->hasPoster()); processTextToArray(tmdb->getEPGText(), 0, tmdb->hasPoster());
textCount = epgText.size(); textCount = epgText.size();
showText(showPos, sy + toph, tmdb->hasPoster()); showText(showPos, sy + toph, tmdb->hasPoster());
showTimerEventBar(true, !mp_info && isCurrentEPG(channel_id), mp_info); //show buttons
timeoutEnd = CRCInput::calcTimeoutEnd(timeout); timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
} }
else else
@@ -1295,6 +1303,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
epgText = epgText_saved; epgText = epgText_saved;
textCount = epgText.size(); textCount = epgText.size();
showText(showPos, sy + toph); showText(showPos, sy + toph);
showTimerEventBar(true, !mp_info && isCurrentEPG(channel_id), mp_info); //show buttons
} }
} }
break; break;
@@ -1700,6 +1709,11 @@ void CEpgData::showTimerEventBar (bool pshow, bool adzap, bool mp_info)
else else
EpgButtons[UsedButtons][1].button = NEUTRINO_ICON_BUTTON_DUMMY_SMALL; EpgButtons[UsedButtons][1].button = NEUTRINO_ICON_BUTTON_DUMMY_SMALL;
if (imdb_active || tmdb_active)
EpgButtons[UsedButtons][1].locale = LOCALE_MISCSETTINGS_EPG_HEAD;
else
EpgButtons[UsedButtons][1].locale = LOCALE_MDB_HEAD;
if (mp_info) if (mp_info)
::paintButtons(x, y, w, MaxButtons, EpgButtons[MP_BUTTONS], w, h); ::paintButtons(x, y, w, MaxButtons, EpgButtons[MP_BUTTONS], w, h);
else else