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

- movieinfo: internally rename epgEpgId -> epgId

Browse Source
This commit is contained in:
vanhofen
2016-09-09 22:01:34 +02:00
committed by svenhoefer
parent 625cbb6122
commit aa8a3849f4
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/record.cpp
View File

@@ -614,7 +614,7 @@ void CRecordInstance::FillMovieInfo(CZapitChannel * channel, APIDList & apid_lis
recMovieInfo->channelId = channel->getChannelID();
recMovieInfo->epgInfo1 = info1;
recMovieInfo->epgInfo2 = info2;
recMovieInfo->epgEpgId = epgid;
recMovieInfo->epgId = epgid;
recMovieInfo->mode = g_Zapit->getMode();
recMovieInfo->VideoPid = allpids.PIDs.vpid;
recMovieInfo->VideoType = channel->type;

6
src/gui/epgview.cpp
View File

@@ -527,7 +527,7 @@ int CEpgData::show_mp(MI_MOVIE_INFO *mi, int mp_position, int mp_duration, bool
epgData.itemDescriptions.clear();
epgData.items.clear();
epgData.fsk = mp_movie_info->parentalLockAge;
epgData.table_id = mp_movie_info->epgEpgId;
epgData.table_id = mp_movie_info->epgId;
#ifdef FULL_CONTENT_CLASSIFICATION
epgData.contentClassification.clear();
#else
@@ -655,7 +655,7 @@ int CEpgData::show_mp(MI_MOVIE_INFO *mi, int mp_position, int mp_duration, bool
epg_done = 100;
//printf("[%s:%d] epg_done: %d\n", __func__, __LINE__, epg_done);
res = show(mp_movie_info->epgEpgId >> 16, 0, 0, doLoop, false, true);
res = show(mp_movie_info->epgId >> 16, 0, 0, doLoop, false, true);
if(!epgTextSwitch.empty())
{
mp_movie_info->epgInfo2 = epgTextSwitch;
@@ -1246,7 +1246,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
}
g_settings.bigFonts = bigFonts;
if (mp_info)
show(mp_movie_info->epgEpgId >> 16, 0, 0, false, false, true);
show(mp_movie_info->epgId >> 16, 0, 0, false, false, true);
else
show(channel_id, id, &startzeit, false, call_fromfollowlist);
showPos=0;

10
src/gui/moviebrowser/mb.cpp
View File

@@ -1260,14 +1260,14 @@ void CMovieBrowser::refreshMovieInfo(void)
// static int logo_h = 0;
int logo_w_max = m_cBoxFrameTitleRel.iWidth / 4;
//printf("refreshMovieInfo: EpgId %llx id %llx y %d\n", m_movieSelectionHandler->epgEpgId, m_movieSelectionHandler->channelId, m_cBoxFrameTitleRel.iY);
//printf("refreshMovieInfo: EpgId %llx id %llx y %d\n", m_movieSelectionHandler->epgId, m_movieSelectionHandler->channelId, m_cBoxFrameTitleRel.iY);
int lx = 0;//never read m_cBoxFrame.iX+m_cBoxFrameTitleRel.iX+m_cBoxFrameTitleRel.iWidth-logo_w-10;
int ly = 0;//never read m_cBoxFrameTitleRel.iY+m_cBoxFrame.iY+ (m_cBoxFrameTitleRel.iHeight-logo_h)/2;
short pb_hdd_offset = g_settings.infobar_show_sysfs_hdd ? 104 : 0;
if (show_mode == MB_SHOW_YT)
pb_hdd_offset = 0;
if (CChannelLogo && (old_EpgId != m_movieSelectionHandler->epgEpgId >>16)) {
if (CChannelLogo && (old_EpgId != m_movieSelectionHandler->epgId >>16)) {
if (newHeader)
CChannelLogo->clearFbData(); // reset logo screen data
else
@@ -1275,10 +1275,10 @@ void CMovieBrowser::refreshMovieInfo(void)
delete CChannelLogo;
CChannelLogo = NULL;
}
if (old_EpgId != m_movieSelectionHandler->epgEpgId >>16) {
if (old_EpgId != m_movieSelectionHandler->epgId >>16) {
if (CChannelLogo == NULL)
CChannelLogo = new CComponentsChannelLogoScalable(0, 0, m_movieSelectionHandler->channelName, m_movieSelectionHandler->epgEpgId >>16); //TODO: add logo into header as item
old_EpgId = m_movieSelectionHandler->epgEpgId >>16;
CChannelLogo = new CComponentsChannelLogoScalable(0, 0, m_movieSelectionHandler->channelName, m_movieSelectionHandler->epgId >>16); //TODO: add logo into header as item
old_EpgId = m_movieSelectionHandler->epgId >>16;
}
if (CChannelLogo && CChannelLogo->hasLogo()) {

6
src/gui/movieinfo.cpp
View File

@@ -111,7 +111,7 @@ bool CMovieInfo::encodeMovieInfoXml(std::string * extMessage, MI_MOVIE_INFO * mo
XML_ADD_TAG_LONG(*extMessage, MI_XML_TAG_ID, movie_info->channelId);
XML_ADD_TAG_STRING(*extMessage, MI_XML_TAG_INFO1, movie_info->epgInfo1);
XML_ADD_TAG_STRING(*extMessage, MI_XML_TAG_INFO2, movie_info->epgInfo2);
XML_ADD_TAG_LONG(*extMessage, MI_XML_TAG_EPGID, movie_info->epgEpgId); // %llu
XML_ADD_TAG_LONG(*extMessage, MI_XML_TAG_EPGID, movie_info->epgId); // %llu
XML_ADD_TAG_UNSIGNED(*extMessage, MI_XML_TAG_MODE, movie_info->mode); // %d
XML_ADD_TAG_UNSIGNED(*extMessage, MI_XML_TAG_VIDEOPID, movie_info->VideoPid); // %u
XML_ADD_TAG_UNSIGNED(*extMessage, MI_XML_TAG_VIDEOTYPE, movie_info->VideoType); // %u
@@ -296,7 +296,7 @@ bool CMovieInfo::parseXmlTree(std::string &_text, MI_MOVIE_INFO *movie_info)
GET_XML_DATA_LONG(text, pos, MI_XML_TAG_ID, movie_info->channelId)
GET_XML_DATA_STRING(text, pos, MI_XML_TAG_INFO1, movie_info->epgInfo1)
GET_XML_DATA_STRING(text, pos, MI_XML_TAG_INFO2, movie_info->epgInfo2)
GET_XML_DATA_LONG(text, pos, MI_XML_TAG_EPGID, movie_info->epgEpgId)
GET_XML_DATA_LONG(text, pos, MI_XML_TAG_EPGID, movie_info->epgId)
GET_XML_DATA_INT(text, pos, MI_XML_TAG_MODE, movie_info->mode)
GET_XML_DATA_INT(text, pos, MI_XML_TAG_VIDEOPID, movie_info->VideoPid)
GET_XML_DATA_INT(text, pos, MI_XML_TAG_VIDEOTYPE, movie_info->VideoType)
@@ -515,7 +515,7 @@ void MI_MOVIE_INFO::clear(void)
//audio = 0;
channelId = 0;
epgEpgId = 0;
epgId = 0;
mode = 0;
VideoPid = 0;
VideoType = 0;

2
src/gui/movieinfo.h
View File

@@ -138,7 +138,7 @@ class MI_MOVIE_INFO //MI_MOVIE_INFO &operator=(const MI_MOVIE_INFO& src);
std::vector<AUDIO_PIDS> audioPids; // available AudioPids, usually filled by VCR. Note: Vectors are easy to is also using the heap (memory fragmentation), might be changed to array [MI_MAX_AUDIO_PIDS]
uint64_t channelId; // channel id, auto filled
uint64_t epgEpgId; // off_t currently not used, we just do not want to loose this info if movie info is saved backed
uint64_t epgId; // EPG id, usually filled by EPG
int mode; // record mode (0: unknown; 1: tv record; 2: radio record)
int VideoPid; // currently not used, we just do not want to loose this info if movie info is saved backed
int VideoType;

2
src/gui/movieplayer.cpp
View File

@@ -1700,7 +1700,7 @@ void CMoviePlayerGui::callInfoViewer(bool init_vzap_it)
mi = milist[idx];
}
}
g_InfoViewer->showMovieTitle(playstate, mi->epgEpgId >>16, mi->channelName, mi->epgTitle, mi->epgInfo1,
g_InfoViewer->showMovieTitle(playstate, mi->epgId >>16, mi->channelName, mi->epgTitle, mi->epgInfo1,
duration, position, repeat_mode, init_vzap_it ? 0 /*IV_MODE_DEFAULT*/ : 1 /*IV_MODE_VIRTUAL_ZAP*/);
return;
}