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 epgMode -> mode

Browse Source
This commit is contained in:
vanhofen
2016-09-09 18:42:14 +02:00
committed by svenhoefer
parent 2911e638c7
commit 1c37abc0a0
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/record.cpp
View File

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

6
src/gui/movieinfo.cpp
View File

@@ -112,7 +112,7 @@ bool CMovieInfo::encodeMovieInfoXml(std::string * extMessage, MI_MOVIE_INFO * mo
XML_ADD_TAG_STRING(*extMessage, MI_XML_TAG_INFO1, movie_info->epgInfo1); 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_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->epgEpgId); // %llu
XML_ADD_TAG_UNSIGNED(*extMessage, MI_XML_TAG_MODE, movie_info->epgMode); // %d XML_ADD_TAG_UNSIGNED(*extMessage, MI_XML_TAG_MODE, movie_info->mode); // %d
XML_ADD_TAG_UNSIGNED(*extMessage, MI_XML_TAG_VIDEOPID, movie_info->epgVideoPid); // %u XML_ADD_TAG_UNSIGNED(*extMessage, MI_XML_TAG_VIDEOPID, movie_info->epgVideoPid); // %u
XML_ADD_TAG_UNSIGNED(*extMessage, MI_XML_TAG_VIDEOTYPE, movie_info->VideoType); // %u XML_ADD_TAG_UNSIGNED(*extMessage, MI_XML_TAG_VIDEOTYPE, movie_info->VideoType); // %u
if ( !movie_info->audioPids.empty() ) { if ( !movie_info->audioPids.empty() ) {
@@ -297,7 +297,7 @@ bool CMovieInfo::parseXmlTree(std::string &_text, MI_MOVIE_INFO *movie_info)
GET_XML_DATA_STRING(text, pos, MI_XML_TAG_INFO1, movie_info->epgInfo1) 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_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->epgEpgId)
GET_XML_DATA_INT(text, pos, MI_XML_TAG_MODE, movie_info->epgMode) 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->epgVideoPid) GET_XML_DATA_INT(text, pos, MI_XML_TAG_VIDEOPID, movie_info->epgVideoPid)
GET_XML_DATA_INT(text, pos, MI_XML_TAG_VIDEOTYPE, movie_info->VideoType) GET_XML_DATA_INT(text, pos, MI_XML_TAG_VIDEOTYPE, movie_info->VideoType)
GET_XML_DATA_STRING(text, pos, MI_XML_TAG_NAME, movie_info->epgChannel) GET_XML_DATA_STRING(text, pos, MI_XML_TAG_NAME, movie_info->epgChannel)
@@ -516,7 +516,7 @@ void MI_MOVIE_INFO::clear(void)
epgId = 0; epgId = 0;
epgEpgId = 0; epgEpgId = 0;
epgMode = 0; mode = 0;
epgVideoPid = 0; epgVideoPid = 0;
VideoType = 0; VideoType = 0;
epgVTXPID = 0; epgVTXPID = 0;

2
src/gui/movieinfo.h
View File

@@ -139,7 +139,7 @@ class MI_MOVIE_INFO //MI_MOVIE_INFO &operator=(const MI_MOVIE_INFO& src);
uint64_t epgId; // currently not used, we just do not want to loose this info if movie info is saved backed uint64_t epgId; // currently not used, we just do not want to loose this info if movie info is saved backed
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 epgEpgId; // off_t currently not used, we just do not want to loose this info if movie info is saved backed
int epgMode; // 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 epgVideoPid; // currently not used, we just do not want to loose this info if movie info is saved backed int epgVideoPid; // currently not used, we just do not want to loose this info if movie info is saved backed
int VideoType; int VideoType;
int epgVTXPID; // currently not used, we just do not want to loose this info if movie info is saved backed int epgVTXPID; // currently not used, we just do not want to loose this info if movie info is saved backed