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

- movieinfo: internally rename epgId -> channelId

Browse Source
This commit is contained in:
vanhofen
2016-09-09 19:43:00 +02:00
committed by svenhoefer
parent a85d539bd0
commit 625cbb6122
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

@@ -611,7 +611,7 @@ void CRecordInstance::FillMovieInfo(CZapitChannel * channel, APIDList & apid_lis
tmpstring = epgTitle;
}
recMovieInfo->epgTitle = tmpstring;
recMovieInfo->epgId = channel->getChannelID();
recMovieInfo->channelId = channel->getChannelID();
recMovieInfo->epgInfo1 = info1;
recMovieInfo->epgInfo2 = info2;
recMovieInfo->epgEpgId = epgid;

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

@@ -1260,7 +1260,7 @@ 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->epgId, m_cBoxFrameTitleRel.iY);
//printf("refreshMovieInfo: EpgId %llx id %llx y %d\n", m_movieSelectionHandler->epgEpgId, 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;

6
src/gui/movieinfo.cpp
View File

@@ -108,7 +108,7 @@ bool CMovieInfo::encodeMovieInfoXml(std::string * extMessage, MI_MOVIE_INFO * mo
"\">\n";
XML_ADD_TAG_STRING(*extMessage, MI_XML_TAG_CHANNELNAME, movie_info->channelName);
XML_ADD_TAG_STRING(*extMessage, MI_XML_TAG_EPGTITLE, movie_info->epgTitle);
XML_ADD_TAG_LONG(*extMessage, MI_XML_TAG_ID, movie_info->epgId);
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
@@ -293,7 +293,7 @@ bool CMovieInfo::parseXmlTree(std::string &_text, MI_MOVIE_INFO *movie_info)
pos++;
GET_XML_DATA_STRING(text, pos, MI_XML_TAG_CHANNELNAME, movie_info->channelName)
GET_XML_DATA_STRING(text, pos, MI_XML_TAG_EPGTITLE, movie_info->epgTitle)
GET_XML_DATA_LONG(text, pos, MI_XML_TAG_ID, movie_info->epgId)
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)
@@ -514,7 +514,7 @@ void MI_MOVIE_INFO::clear(void)
//format = 0;
//audio = 0;
epgId = 0;
channelId = 0;
epgEpgId = 0;
mode = 0;
VideoPid = 0;

4
src/gui/movieinfo.h
View File

@@ -120,7 +120,7 @@ class MI_MOVIE_INFO //MI_MOVIE_INFO &operator=(const MI_MOVIE_INFO& src);
std::string epgTitle; // plain movie name, usually filled by EPG
std::string epgInfo1; // used for Genre (Premiere) or second title, usually filled by EPG
std::string epgInfo2; // detailed movie content, usually filled by EPG
std::string channelName; // Channel name, usually filled by EPG
std::string channelName; // channel name, auto filled
std::string serieName; // user defines series name
time_t dateOfLastPlay; // last play date of movie in seconds since 1970
@@ -137,7 +137,7 @@ class MI_MOVIE_INFO //MI_MOVIE_INFO &operator=(const MI_MOVIE_INFO& src);
MI_MOVIE_BOOKMARKS bookmarks; // bookmark collecton for this movie
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 epgId; // currently not used, we just do not want to loose this info if movie info is saved backed
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
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

12
src/gui/movieplayer.cpp
View File

@@ -690,7 +690,7 @@ void* CMoviePlayerGui::bgPlayThread(void *arg)
int eof = 0, pos = 0;
unsigned char *chid = new unsigned char[sizeof(t_channel_id)];
*(t_channel_id*)chid = mp->movie_info.epgId;
*(t_channel_id*)chid = mp->movie_info.channelId;
bool started = mp->StartWebtv();
printf("%s: started: %d\n", __func__, started);fflush(stdout);
@@ -1029,7 +1029,7 @@ bool CMoviePlayerGui::PlayBackgroundStart(const std::string &file, const std::st
instance_bg->movie_info.epgTitle = name;
instance_bg->movie_info.channelName = realUrl;
instance_bg->movie_info.epgId = chan;
instance_bg->movie_info.channelId = chan;
instance_bg->p_movie_info = &movie_info;
stopPlayBack();
@@ -1123,7 +1123,7 @@ bool CMoviePlayerGui::PlayFileStart(void)
}
duration = p_movie_info->length * 60 * 1000;
int percent = CZapit::getInstance()->GetPidVolume(p_movie_info->epgId, currentapid, currentac3 == 1);
int percent = CZapit::getInstance()->GetPidVolume(p_movie_info->channelId, currentapid, currentac3 == 1);
CZapit::getInstance()->SetVolumePercent(percent);
}
@@ -1153,7 +1153,7 @@ bool CMoviePlayerGui::PlayFileStart(void)
int i;
int towait = (timeshift == TSHIFT_MODE_ON) ? TIMESHIFT_SECONDS+1 : TIMESHIFT_SECONDS;
int cnt = 500;
if (IS_WEBTV(movie_info.epgId)) {
if (IS_WEBTV(movie_info.channelId)) {
videoDecoder->setBlank(false);
cnt = 200;
towait = 20;
@@ -1842,10 +1842,10 @@ void CMoviePlayerGui::selectAudioPid()
if (p_movie_info && numpida <= p_movie_info->audioPids.size()) {
APIDSelector.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_AUDIOMENU_VOLUME_ADJUST));
CVolume::getInstance()->SetCurrentChannel(p_movie_info->epgId);
CVolume::getInstance()->SetCurrentChannel(p_movie_info->channelId);
CVolume::getInstance()->SetCurrentPid(currentapid);
for (uint i=0; i < numpida; i++) {
percent[i] = CZapit::getInstance()->GetPidVolume(p_movie_info->epgId, apids[i], ac3flags[i]);
percent[i] = CZapit::getInstance()->GetPidVolume(p_movie_info->channelId, apids[i], ac3flags[i]);
APIDSelector.addItem(new CMenuOptionNumberChooser(p_movie_info->audioPids[i].AudioPidName,
&percent[i], currentapid == apids[i],
0, 999, CVolume::getInstance()));

2
src/timerd/timermanager.cpp
View File

@@ -1240,7 +1240,7 @@ void CTimerEvent_Record::saveToConfig(CConfigFile *config)
//------------------------------------------------------------
void CTimerEvent_Record::Reschedule()
{
// clear epgId on reschedule
// clear epgID on reschedule
eventInfo.epgID = 0;
eventInfo.epg_starttime = 0;
epgTitle="";