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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 17546e7ba1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-10 (Sat, 10 Jun 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-10 11:43:50 +02:00
parent 6755871162 1fc432032a
commit 5a43934c6b
40 changed files with 122 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/epgview.cpp
View File

@@ -1232,7 +1232,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
showTimerEventBar(true, !mp_info && isCurrentEPG(channel_id), mp_info); //show buttons
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]);
}
else
else if (imdb_active && imdb->gotPoster())
{
imdb_active = false;
CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, LOCALE_IMDB_INFO_SAVE);
@@ -1625,7 +1625,17 @@ void CEpgData::showTimerEventBar (bool pshow, bool adzap, bool mp_info)
}
bool tmdb = g_settings.tmdb_enabled;
bool fscr = (has_follow_screenings && !call_fromfollowlist);
EpgButtons[mp_info ? 2 : (fscr ? 0 : 1)][1].locale = imdb_active ? LOCALE_IMDB_INFO_SAVE : LOCALE_IMDB_INFO; //NI
//NI
if (imdb_active)
{
EpgButtons[mp_info ? 2 : (fscr ? 0 : 1)][1].button = (imdb->gotPoster()) ? NEUTRINO_ICON_BUTTON_GREEN : NEUTRINO_ICON_BUTTON_DUMMY_SMALL;
EpgButtons[mp_info ? 2 : (fscr ? 0 : 1)][1].locale = LOCALE_IMDB_INFO_SAVE;
}
else
{
EpgButtons[mp_info ? 2 : (fscr ? 0 : 1)][1].button = NEUTRINO_ICON_BUTTON_GREEN;
EpgButtons[mp_info ? 2 : (fscr ? 0 : 1)][1].locale = LOCALE_IMDB_INFO;
}
if (mp_info)
::paintButtons(x, y, w, tmdb ? 3 : 2, EpgButtons[2], w, h); //NI
else