frodovdr/vdr-plugin-skindesigner
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git synced 2023-10-19 17:58:31 +02:00
Code Issues Releases Wiki Activity

fixed incorrect display for channels without EPG

Browse Source
This commit is contained in:
louis 2016-03-30 17:17:34 +02:00
parent e59f285ac3
commit 3cc3c03f7d
5 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
coreengine/viewdisplaymenu.c
View File

@ -405,6 +405,7 @@ void cViewMenu::SetMessage(eMessageType type, const char *text) {
void cViewMenu::SetChannelHeader(const cEvent *event) {
if (!event)
return;
if (menuChange && menuCat == mcSchedule) {
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
LOCK_CHANNELS_READ;
@ -793,7 +794,8 @@ eMenuOrientation cSubView::MenuOrientation(void) {
void cSubView::SetTitle(const char *title) {
if (header) {
header->SetTitle(title);
header->SetTitle(title);
header->ClearChannel();
}
}

5
coreengine/viewelementsdisplaychannel.c
View File

@ -569,6 +569,11 @@ cVeDcScraperContent::cVeDcScraperContent(void) {
cVeDcScraperContent::~cVeDcScraperContent(void) {
}
void cVeDcScraperContent::Close(void) {
tokenContainer->Clear();
cViewElement::Close();
}
void cVeDcScraperContent::SetTokenContainer(void) {
tokenContainer = new skindesignerapi::cTokenContainer();
tokenContainer->DefineStringToken("{posterpath}", (int)eScraperPosterBannerST::posterpath);

1
coreengine/viewelementsdisplaychannel.h
View File

@ -124,6 +124,7 @@ private:
public:
cVeDcScraperContent(void);
virtual ~cVeDcScraperContent(void);
void Close(void);
void SetTokenContainer(void);
void Set(const cEvent *e);
};

13
coreengine/viewelementsdisplaymenu.c
View File

@ -57,13 +57,22 @@ void cVeDmHeader::SetTitle(const char *title) {
}
void cVeDmHeader::SetChannel(const cChannel *channel) {
ClearChannel();
if (!channel)
return;
channelNumber = channel->Number();
free(channelName);
free(channelId);
channelName = strdup(channel->Name());
channelId = strdup(*(channel->GetChannelID().ToString()));
}
void cVeDmHeader::ClearChannel(void) {
channelNumber = 0;
free(channelName);
channelName = NULL;
free(channelId);
channelId = NULL;
}
void cVeDmHeader::Set(eMenuCategory menuCat) {
if (!changed)
return;

1
coreengine/viewelementsdisplaymenu.h
View File

@ -21,6 +21,7 @@ public:
void SetTokenContainer(void);
void SetTitle(const char *title);
void SetChannel(const cChannel *channel);
void ClearChannel(void);
void Set(eMenuCategory menuCat);
void IsEpgSearchFav(bool isFav) { epgSearchFav = isFav;} ;
};