frodovdr
/
vdr-plugin-skindesigner
mirror of https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed epgpics in detailedepgview

This commit is contained in:
louis 2016-02-06 10:33:18 +01:00
parent 7c6167a79e
commit 86d3df4223
4 changed files with 1109 additions and 1095 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.c
View File

@ -92,7 +92,7 @@ void cDesignerConfig::ReadSkinFolder(cString &skinFolder, vector<string> *contai
while (dirEntry = readdir(folder)) { while (dirEntry = readdir(folder)) {
string dirEntryName = dirEntry->d_name; string dirEntryName = dirEntry->d_name;
int dirEntryType = dirEntry->d_type; int dirEntryType = dirEntry->d_type;
if (!dirEntryName.compare(".") || !dirEntryName.compare("..") || !dirEntryName.compare("skinrepositories") || dirEntryType != DT_DIR) if (!dirEntryName.compare(".") || !dirEntryName.compare("..") || !dirEntryName.compare("skinrepositories") || (dirEntryType != DT_DIR && dirEntryType != DT_LNK))
continue; continue;
container->push_back(dirEntryName); container->push_back(dirEntryName);
} }

6
coreengine/definitions.h
View File

@ -1234,9 +1234,9 @@ enum class eDmDetailedEpgIT {
channelnumber, channelnumber,
channellogoexists, channellogoexists,
hasreruns, hasreruns,
epgpic1avaialble, epgpic1available,
epgpic2avaialble, epgpic2available,
epgpic3avaialble, epgpic3available,
count count
}; };

19
coreengine/viewdetail.c
View File

@ -1,5 +1,6 @@
#include "viewdetail.h" #include "viewdetail.h"
#include "../config.h" #include "../config.h"
#include "../extensions/helpers.h"
/****************************************************************** /******************************************************************
* cViewDetail * cViewDetail
******************************************************************/ ******************************************************************/
@ -270,9 +271,9 @@ void cViewDetailEpg::SetTokenContainer(void) {
tokenContainer->DefineIntToken("{channelnumber}", (int)eDmDetailedEpgIT::channelnumber); tokenContainer->DefineIntToken("{channelnumber}", (int)eDmDetailedEpgIT::channelnumber);
tokenContainer->DefineIntToken("{channellogoexists}", (int)eDmDetailedEpgIT::channellogoexists); tokenContainer->DefineIntToken("{channellogoexists}", (int)eDmDetailedEpgIT::channellogoexists);
tokenContainer->DefineIntToken("{hasreruns}", (int)eDmDetailedEpgIT::hasreruns); tokenContainer->DefineIntToken("{hasreruns}", (int)eDmDetailedEpgIT::hasreruns);
tokenContainer->DefineIntToken("{epgpic1avaialble}", (int)eDmDetailedEpgIT::epgpic1avaialble); tokenContainer->DefineIntToken("{epgpic1available}", (int)eDmDetailedEpgIT::epgpic1available);
tokenContainer->DefineIntToken("{epgpic2avaialble}", (int)eDmDetailedEpgIT::epgpic2avaialble); tokenContainer->DefineIntToken("{epgpic2available}", (int)eDmDetailedEpgIT::epgpic2available);
tokenContainer->DefineIntToken("{epgpic3avaialble}", (int)eDmDetailedEpgIT::epgpic3avaialble); tokenContainer->DefineIntToken("{epgpic3available}", (int)eDmDetailedEpgIT::epgpic3available);
tokenContainer->DefineIntToken("{ismovie}", (int)eScraperIT::ismovie); tokenContainer->DefineIntToken("{ismovie}", (int)eScraperIT::ismovie);
tokenContainer->DefineIntToken("{moviebudget}", (int)eScraperIT::moviebudget); tokenContainer->DefineIntToken("{moviebudget}", (int)eScraperIT::moviebudget);
tokenContainer->DefineIntToken("{movierevenue}", (int)eScraperIT::movierevenue); tokenContainer->DefineIntToken("{movierevenue}", (int)eScraperIT::movierevenue);
@ -394,6 +395,7 @@ bool cViewDetailEpg::Parse(bool forced) {
if (scrapInfoAvailable) { if (scrapInfoAvailable) {
SetFullScrapInfo(tokenContainer, actorsIndex); SetFullScrapInfo(tokenContainer, actorsIndex);
} }
SetEpgPictures(event->EventID());
SetDirty(); SetDirty();
return true; return true;
} }
@ -495,6 +497,17 @@ void cViewDetailEpg::SetReruns(cList<Epgsearch_searchresults_v1_0::cServiceSearc
} }
} }
void cViewDetailEpg::SetEpgPictures(int eventId) {
for (int i=0; i<3; i++) {
cString epgPic = cString::sprintf("%s%d_%d.jpg", *config.epgImagePath, eventId, i);
bool epgPicAvailable = FileExists(*epgPic);
int indexAvailable = (int)eDmDetailedEpgIT::epgpic1available + i;
int indexPath = (int)eDmDetailedEpgST::epgpic1path + i;
tokenContainer->AddIntToken(indexAvailable, epgPicAvailable);
tokenContainer->AddStringToken(indexPath, *epgPic);
}
}
/****************************************************************** /******************************************************************
* cViewDetailRec * cViewDetailRec
******************************************************************/ ******************************************************************/

1
coreengine/viewdetail.h
View File

@ -46,6 +46,7 @@ protected:
cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *LoadReruns(void); cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *LoadReruns(void);
int NumReruns(cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *reruns); int NumReruns(cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *reruns);
void SetReruns(cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *reruns); void SetReruns(cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *reruns);
void SetEpgPictures(int eventId);
public: public:
cViewDetailEpg(void); cViewDetailEpg(void);
virtual ~cViewDetailEpg(void); virtual ~cViewDetailEpg(void);