diff --git a/HISTORY b/HISTORY index a5d89e8..0c87141 100644 --- a/HISTORY +++ b/HISTORY @@ -22,4 +22,4 @@ Version 0.0.2 - added support for custom tokens in dislaychannel - added vps token in menudetailepg - implemented cSDDisplayMenu::GetTextAreaFont() - +- introduced new viewelement audioinfo in displaychannel diff --git a/displaychannel.c b/displaychannel.c index 7442b87..a416073 100644 --- a/displaychannel.c +++ b/displaychannel.c @@ -63,12 +63,15 @@ void cSDDisplayChannel::SetChannel(const cChannel *Channel, int Number) { channelView->ClearStatusIcons(); channelView->ClearChannelGroups(); channelView->ClearScraperContent(); + channelView->ClearAudioInfo(); if (!groupSep) { channelView->DrawChannel(ChannelNumber, ChannelName, ChannelID, (Number > 0)?true:false); channelView->DrawProgressBarBack(); channelView->DrawSignalBackground(); - if (Channel) + if (Channel) { channelView->DrawStatusIcons(Channel); + channelView->DrawAudioInfo(); + } } else { channelView->ClearSignal(); channelView->ClearSignalBackground(); @@ -155,6 +158,7 @@ void cSDDisplayChannel::SetMessage(eMessageType Type, const char *Text) { channelView->ClearSignal(); channelView->ClearSignalBackground(); channelView->ClearScraperContent(); + channelView->ClearAudioInfo(); channelView->DisplayMessage(Type, Text); groupSep = true; } @@ -180,6 +184,7 @@ void cSDDisplayChannel::Flush(void) { if (!groupSep) { channelView->DrawScreenResolution(); channelView->DrawSignal(); + channelView->DrawAudioInfo(); } else { channelView->ClearStatusIcons(); channelView->ClearScreenResolution(); diff --git a/displaychannel.h b/displaychannel.h index 44d69e5..75888fd 100644 --- a/displaychannel.h +++ b/displaychannel.h @@ -18,7 +18,6 @@ private: int lastSignalQuality; int lastScreenWidth; int currentLast; - bool showSignal; const cEvent *present; void SetProgressBar(const cEvent *present); public: diff --git a/dtd/displaychannel.dtd b/dtd/displaychannel.dtd index be0f22e..33ae069 100644 --- a/dtd/displaychannel.dtd +++ b/dtd/displaychannel.dtd @@ -3,7 +3,7 @@ + + + @@ -112,6 +108,15 @@ + + + + + + + + - - + + +