mirror of
https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git
synced 2023-10-19 17:58:31 +02:00
fixed incorrect display for channels without EPG
This commit is contained in:
parent
e59f285ac3
commit
3cc3c03f7d
@ -405,6 +405,7 @@ void cViewMenu::SetMessage(eMessageType type, const char *text) {
|
|||||||
void cViewMenu::SetChannelHeader(const cEvent *event) {
|
void cViewMenu::SetChannelHeader(const cEvent *event) {
|
||||||
if (!event)
|
if (!event)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (menuChange && menuCat == mcSchedule) {
|
if (menuChange && menuCat == mcSchedule) {
|
||||||
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
|
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
|
||||||
LOCK_CHANNELS_READ;
|
LOCK_CHANNELS_READ;
|
||||||
@ -793,7 +794,8 @@ eMenuOrientation cSubView::MenuOrientation(void) {
|
|||||||
|
|
||||||
void cSubView::SetTitle(const char *title) {
|
void cSubView::SetTitle(const char *title) {
|
||||||
if (header) {
|
if (header) {
|
||||||
header->SetTitle(title);
|
header->SetTitle(title);
|
||||||
|
header->ClearChannel();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -569,6 +569,11 @@ cVeDcScraperContent::cVeDcScraperContent(void) {
|
|||||||
cVeDcScraperContent::~cVeDcScraperContent(void) {
|
cVeDcScraperContent::~cVeDcScraperContent(void) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void cVeDcScraperContent::Close(void) {
|
||||||
|
tokenContainer->Clear();
|
||||||
|
cViewElement::Close();
|
||||||
|
}
|
||||||
|
|
||||||
void cVeDcScraperContent::SetTokenContainer(void) {
|
void cVeDcScraperContent::SetTokenContainer(void) {
|
||||||
tokenContainer = new skindesignerapi::cTokenContainer();
|
tokenContainer = new skindesignerapi::cTokenContainer();
|
||||||
tokenContainer->DefineStringToken("{posterpath}", (int)eScraperPosterBannerST::posterpath);
|
tokenContainer->DefineStringToken("{posterpath}", (int)eScraperPosterBannerST::posterpath);
|
||||||
|
@ -124,6 +124,7 @@ private:
|
|||||||
public:
|
public:
|
||||||
cVeDcScraperContent(void);
|
cVeDcScraperContent(void);
|
||||||
virtual ~cVeDcScraperContent(void);
|
virtual ~cVeDcScraperContent(void);
|
||||||
|
void Close(void);
|
||||||
void SetTokenContainer(void);
|
void SetTokenContainer(void);
|
||||||
void Set(const cEvent *e);
|
void Set(const cEvent *e);
|
||||||
};
|
};
|
||||||
|
@ -57,13 +57,22 @@ void cVeDmHeader::SetTitle(const char *title) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void cVeDmHeader::SetChannel(const cChannel *channel) {
|
void cVeDmHeader::SetChannel(const cChannel *channel) {
|
||||||
|
ClearChannel();
|
||||||
|
if (!channel)
|
||||||
|
return;
|
||||||
channelNumber = channel->Number();
|
channelNumber = channel->Number();
|
||||||
free(channelName);
|
|
||||||
free(channelId);
|
|
||||||
channelName = strdup(channel->Name());
|
channelName = strdup(channel->Name());
|
||||||
channelId = strdup(*(channel->GetChannelID().ToString()));
|
channelId = strdup(*(channel->GetChannelID().ToString()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void cVeDmHeader::ClearChannel(void) {
|
||||||
|
channelNumber = 0;
|
||||||
|
free(channelName);
|
||||||
|
channelName = NULL;
|
||||||
|
free(channelId);
|
||||||
|
channelId = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
void cVeDmHeader::Set(eMenuCategory menuCat) {
|
void cVeDmHeader::Set(eMenuCategory menuCat) {
|
||||||
if (!changed)
|
if (!changed)
|
||||||
return;
|
return;
|
||||||
|
@ -21,6 +21,7 @@ public:
|
|||||||
void SetTokenContainer(void);
|
void SetTokenContainer(void);
|
||||||
void SetTitle(const char *title);
|
void SetTitle(const char *title);
|
||||||
void SetChannel(const cChannel *channel);
|
void SetChannel(const cChannel *channel);
|
||||||
|
void ClearChannel(void);
|
||||||
void Set(eMenuCategory menuCat);
|
void Set(eMenuCategory menuCat);
|
||||||
void IsEpgSearchFav(bool isFav) { epgSearchFav = isFav;} ;
|
void IsEpgSearchFav(bool isFav) { epgSearchFav = isFav;} ;
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user