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 epgChannel -> ChannelName

Browse Source
This commit is contained in:
vanhofen
2016-09-09 19:33:04 +02:00
committed by svenhoefer
parent c5dcb1c4f6
commit a85d539bd0
7 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/record.cpp
View File

@@ -570,9 +570,9 @@ void CRecordInstance::FillMovieInfo(CZapitChannel * channel, APIDList & apid_lis
std::string tmpstring = channel->getName(); std::string tmpstring = channel->getName();
if (tmpstring.empty()) if (tmpstring.empty())
recMovieInfo->epgChannel = "unknown"; recMovieInfo->channelName = "unknown";
else else
recMovieInfo->epgChannel = tmpstring; recMovieInfo->channelName = tmpstring;
tmpstring = "not available"; tmpstring = "not available";
if (epgid != 0) { if (epgid != 0) {

4
src/gui/epgview.cpp
View File

@@ -551,12 +551,12 @@ int CEpgData::show_mp(MI_MOVIE_INFO *mi, int mp_position, int mp_duration, bool
extMovieInfo += mp_movie_info->serieName; extMovieInfo += mp_movie_info->serieName;
extMovieInfo += "\n"; extMovieInfo += "\n";
} }
if (!mp_movie_info->epgChannel.empty()) if (!mp_movie_info->channelName.empty())
{ {
extMovieInfo += "\n"; extMovieInfo += "\n";
extMovieInfo += g_Locale->getText(LOCALE_MOVIEBROWSER_INFO_CHANNEL); extMovieInfo += g_Locale->getText(LOCALE_MOVIEBROWSER_INFO_CHANNEL);
extMovieInfo += ": "; extMovieInfo += ": ";
extMovieInfo += mp_movie_info->epgChannel; extMovieInfo += mp_movie_info->channelName;
extMovieInfo += "\n"; extMovieInfo += "\n";
} }
if (mp_movie_info->rating != 0) if (mp_movie_info->rating != 0)

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

@@ -1277,7 +1277,7 @@ void CMovieBrowser::refreshMovieInfo(void)
} }
if (old_EpgId != m_movieSelectionHandler->epgEpgId >>16) { if (old_EpgId != m_movieSelectionHandler->epgEpgId >>16) {
if (CChannelLogo == NULL) if (CChannelLogo == NULL)
CChannelLogo = new CComponentsChannelLogoScalable(0, 0, m_movieSelectionHandler->epgChannel, m_movieSelectionHandler->epgEpgId >>16); //TODO: add logo into header as item 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; old_EpgId = m_movieSelectionHandler->epgEpgId >>16;
} }
@@ -2547,7 +2547,7 @@ bool CMovieBrowser::addFile(CFile &file, int dirItNr)
movieInfo.file = file; movieInfo.file = file;
if(!m_movieInfo.loadMovieInfo(&movieInfo)) { if(!m_movieInfo.loadMovieInfo(&movieInfo)) {
movieInfo.epgChannel = string(g_Locale->getText(LOCALE_MOVIEPLAYER_HEAD)); movieInfo.channelName = string(g_Locale->getText(LOCALE_MOVIEPLAYER_HEAD));
movieInfo.epgTitle = file.getFileName(); movieInfo.epgTitle = file.getFileName();
} }
movieInfo.dirItNr = dirItNr; movieInfo.dirItNr = dirItNr;
@@ -2947,7 +2947,7 @@ int CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
snprintf(size,BUFFER_SIZE,"%5" PRIu64 "",movie_info->file.Size>>20); snprintf(size,BUFFER_SIZE,"%5" PRIu64 "",movie_info->file.Size>>20);
CKeyboardInput titelUserInput(LOCALE_MOVIEBROWSER_INFO_TITLE, &movie_info->epgTitle, (movie_info->epgTitle.empty() || (movie_info->epgTitle.size() < MAX_STRING)) ? MAX_STRING:movie_info->epgTitle.size()); CKeyboardInput titelUserInput(LOCALE_MOVIEBROWSER_INFO_TITLE, &movie_info->epgTitle, (movie_info->epgTitle.empty() || (movie_info->epgTitle.size() < MAX_STRING)) ? MAX_STRING:movie_info->epgTitle.size());
CKeyboardInput channelUserInput(LOCALE_MOVIEBROWSER_INFO_CHANNEL, &movie_info->epgChannel, MAX_STRING); CKeyboardInput channelUserInput(LOCALE_MOVIEBROWSER_INFO_CHANNEL, &movie_info->channelName, MAX_STRING);
CKeyboardInput epgUserInput(LOCALE_MOVIEBROWSER_INFO_INFO1, &movie_info->epgInfo1, 20); CKeyboardInput epgUserInput(LOCALE_MOVIEBROWSER_INFO_INFO1, &movie_info->epgInfo1, 20);
CKeyboardInput countryUserInput(LOCALE_MOVIEBROWSER_INFO_PRODCOUNTRY, &movie_info->productionCountry, 11); CKeyboardInput countryUserInput(LOCALE_MOVIEBROWSER_INFO_PRODCOUNTRY, &movie_info->productionCountry, 11);
@@ -2977,7 +2977,7 @@ int CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
movieInfoMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_INFO_PRODYEAR, true, yearUserIntInput.getValue(), &yearUserIntInput,NULL, CRCInput::RC_7)); movieInfoMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_INFO_PRODYEAR, true, yearUserIntInput.getValue(), &yearUserIntInput,NULL, CRCInput::RC_7));
movieInfoMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_INFO_PRODCOUNTRY, true, movie_info->productionCountry, &countryUserInput,NULL, CRCInput::RC_8)); movieInfoMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_INFO_PRODCOUNTRY, true, movie_info->productionCountry, &countryUserInput,NULL, CRCInput::RC_8));
movieInfoMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_INFO_LENGTH, true, lengthUserIntInput.getValue(), &lengthUserIntInput,NULL, CRCInput::RC_9)); movieInfoMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_INFO_LENGTH, true, lengthUserIntInput.getValue(), &lengthUserIntInput,NULL, CRCInput::RC_9));
movieInfoMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_INFO_CHANNEL, true, movie_info->epgChannel, &channelUserInput,NULL, CRCInput::RC_0));//LOCALE_TIMERLIST_CHANNEL movieInfoMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_INFO_CHANNEL, true, movie_info->channelName, &channelUserInput,NULL, CRCInput::RC_0));//LOCALE_TIMERLIST_CHANNEL
movieInfoMenu.addItem(GenericMenuSeparatorLine); movieInfoMenu.addItem(GenericMenuSeparatorLine);
movieInfoMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_INFO_PATH, false, dirItNr)); //LOCALE_TIMERLIST_RECORDING_DIR movieInfoMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_INFO_PATH, false, dirItNr)); //LOCALE_TIMERLIST_RECORDING_DIR
movieInfoMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_INFO_PREVPLAYDATE, false, dateUserDateInput.getValue()));//LOCALE_FLASHUPDATE_CURRENTVERSIONDATE movieInfoMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_INFO_PREVPLAYDATE, false, dateUserDateInput.getValue()));//LOCALE_FLASHUPDATE_CURRENTVERSIONDATE
@@ -3352,7 +3352,7 @@ bool CMovieBrowser::getMovieInfoItem(MI_MOVIE_INFO& movie_info, MB_INFO_ITEM ite
*item_string = str_tmp; *item_string = str_tmp;
break; break;
case MB_INFO_CHANNEL: // = 9, case MB_INFO_CHANNEL: // = 9,
*item_string = movie_info.epgChannel; *item_string = movie_info.channelName;
break; break;
case MB_INFO_BOOKMARK: // = 10, case MB_INFO_BOOKMARK: // = 10,
b = ""; b = "";
@@ -3529,7 +3529,7 @@ void CMovieBrowser::loadYTitles(int mode, std::string search, std::string id)
yt_video_list_t &ylist = ytparser.GetVideoList(); yt_video_list_t &ylist = ytparser.GetVideoList();
for (unsigned i = 0; i < ylist.size(); i++) { for (unsigned i = 0; i < ylist.size(); i++) {
MI_MOVIE_INFO movieInfo; MI_MOVIE_INFO movieInfo;
movieInfo.epgChannel = ylist[i].author; movieInfo.channelName = ylist[i].author;
movieInfo.epgTitle = ylist[i].title; movieInfo.epgTitle = ylist[i].title;
movieInfo.epgInfo1 = ylist[i].category; movieInfo.epgInfo1 = ylist[i].category;
movieInfo.epgInfo2 = ylist[i].description; movieInfo.epgInfo2 = ylist[i].description;

4
src/gui/moviebrowser/mb_functions.h
View File

@@ -42,9 +42,9 @@ bool sortByGenre(const MI_MOVIE_INFO* a, const MI_MOVIE_INFO* b)
} }
bool sortByChannel(const MI_MOVIE_INFO* a, const MI_MOVIE_INFO* b) bool sortByChannel(const MI_MOVIE_INFO* a, const MI_MOVIE_INFO* b)
{ {
if (std::lexicographical_compare(a->epgChannel.begin(), a->epgChannel.end(), b->epgChannel.begin(), b->epgChannel.end(), compare_to_lower)) if (std::lexicographical_compare(a->channelName.begin(), a->channelName.end(), b->channelName.begin(), b->channelName.end(), compare_to_lower))
return true; return true;
if (std::lexicographical_compare(b->epgChannel.begin(), b->epgChannel.end(), a->epgChannel.begin(), a->epgChannel.end(), compare_to_lower)) if (std::lexicographical_compare(b->channelName.begin(), b->channelName.end(), a->channelName.begin(), a->channelName.end(), compare_to_lower))
return false; return false;
return sortByTitle(a,b); return sortByTitle(a,b);
} }

8
src/gui/movieinfo.cpp
View File

@@ -106,7 +106,7 @@ bool CMovieInfo::encodeMovieInfoXml(std::string * extMessage, MI_MOVIE_INFO * mo
"\t<" MI_XML_TAG_RECORD " command=\"" "\t<" MI_XML_TAG_RECORD " command=\""
"record" "record"
"\">\n"; "\">\n";
XML_ADD_TAG_STRING(*extMessage, MI_XML_TAG_CHANNELNAME, movie_info->epgChannel); 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_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->epgId);
XML_ADD_TAG_STRING(*extMessage, MI_XML_TAG_INFO1, movie_info->epgInfo1); XML_ADD_TAG_STRING(*extMessage, MI_XML_TAG_INFO1, movie_info->epgInfo1);
@@ -291,7 +291,7 @@ bool CMovieInfo::parseXmlTree(std::string &_text, MI_MOVIE_INFO *movie_info)
while ((pos = find_next_char('<', text, pos, bytes)) != -1) { while ((pos = find_next_char('<', text, pos, bytes)) != -1) {
pos++; pos++;
GET_XML_DATA_STRING(text, pos, MI_XML_TAG_CHANNELNAME, movie_info->epgChannel) 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_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->epgId)
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)
@@ -300,7 +300,7 @@ bool CMovieInfo::parseXmlTree(std::string &_text, MI_MOVIE_INFO *movie_info)
GET_XML_DATA_INT(text, pos, MI_XML_TAG_MODE, movie_info->mode) 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_VIDEOPID, movie_info->VideoPid)
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->channelName)
GET_XML_DATA_INT(text, pos, MI_XML_TAG_VTXTPID, movie_info->VtxtPid) GET_XML_DATA_INT(text, pos, MI_XML_TAG_VTXTPID, movie_info->VtxtPid)
GET_XML_DATA_INT(text, pos, MI_XML_TAG_GENRE_MAJOR, movie_info->genreMajor) GET_XML_DATA_INT(text, pos, MI_XML_TAG_GENRE_MAJOR, movie_info->genreMajor)
GET_XML_DATA_INT(text, pos, MI_XML_TAG_GENRE_MINOR, movie_info->genreMinor) GET_XML_DATA_INT(text, pos, MI_XML_TAG_GENRE_MINOR, movie_info->genreMinor)
@@ -527,7 +527,7 @@ void MI_MOVIE_INFO::clear(void)
epgTitle = ""; epgTitle = "";
epgInfo1 = ""; epgInfo1 = "";
epgInfo2 = ""; epgInfo2 = "";
epgChannel = ""; channelName = "";
serieName = ""; serieName = "";
bookmarks.end = 0; bookmarks.end = 0;
bookmarks.start = 0; bookmarks.start = 0;

2
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 epgTitle; // plain movie name, usually filled by EPG
std::string epgInfo1; // used for Genre (Premiere) or second title, 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 epgInfo2; // detailed movie content, usually filled by EPG
std::string epgChannel; // Channel name, usually filled by EPG std::string channelName; // Channel name, usually filled by EPG
std::string serieName; // user defines series name std::string serieName; // user defines series name
time_t dateOfLastPlay; // last play date of movie in seconds since 1970 time_t dateOfLastPlay; // last play date of movie in seconds since 1970

4
src/gui/movieplayer.cpp
View File

@@ -1028,7 +1028,7 @@ bool CMoviePlayerGui::PlayBackgroundStart(const std::string &file, const std::st
instance_bg->cookie_header = cookie_header; instance_bg->cookie_header = cookie_header;
instance_bg->movie_info.epgTitle = name; instance_bg->movie_info.epgTitle = name;
instance_bg->movie_info.epgChannel = realUrl; instance_bg->movie_info.channelName = realUrl;
instance_bg->movie_info.epgId = chan; instance_bg->movie_info.epgId = chan;
instance_bg->p_movie_info = &movie_info; instance_bg->p_movie_info = &movie_info;
@@ -1700,7 +1700,7 @@ void CMoviePlayerGui::callInfoViewer(bool init_vzap_it)
mi = milist[idx]; mi = milist[idx];
} }
} }
g_InfoViewer->showMovieTitle(playstate, mi->epgEpgId >>16, mi->epgChannel, mi->epgTitle, mi->epgInfo1, g_InfoViewer->showMovieTitle(playstate, mi->epgEpgId >>16, mi->channelName, mi->epgTitle, mi->epgInfo1,
duration, position, repeat_mode, init_vzap_it ? 0 /*IV_MODE_DEFAULT*/ : 1 /*IV_MODE_VIRTUAL_ZAP*/); duration, position, repeat_mode, init_vzap_it ? 0 /*IV_MODE_DEFAULT*/ : 1 /*IV_MODE_VIRTUAL_ZAP*/);
return; return;
} }