diff options
| -rw-r--r-- | neutrinoepg.c | 10 | ||||
| -rw-r--r-- | neutrinoepg.h | 2 | ||||
| -rw-r--r-- | osdmenu.c | 17 | ||||
| -rw-r--r-- | po/de_DE.po | 9 |
4 files changed, 29 insertions, 9 deletions
diff --git a/neutrinoepg.c b/neutrinoepg.c index 48c8ea5..74237c8 100644 --- a/neutrinoepg.c +++ b/neutrinoepg.c @@ -19,7 +19,7 @@ int middlemenuentry = false; int switchgroupkey = 0; int ChannelNameWidth = 15; - +bool ReloadFilters = false; // --- myMenuSetup ------------------------------------------------------------ class myMenuSetup : public cMenuSetupPage { @@ -42,7 +42,9 @@ class myMenuSetup : public cMenuSetupPage SetupStore("middlemenuentry", middlemenuentry); SetupStore("switchgroupkey", switchgroupkey); SetupStore("ChannelNameWidth", ChannelNameWidth); - } + + ReloadFilters = true; + } public: myMenuSetup() { @@ -55,7 +57,7 @@ class myMenuSetup : public cMenuSetupPage Add(new cOsdItem(tr("Behavior"), osUnknown, false)); Add(new cMenuEditIntItem(tr("Step width (min)"), &Step)); Add(new cMenuEditTimeItem(tr("Favorite time"), &bookmark)); - Add(new cMenuEditStraItem(tr("Switch with OK"), &switchwithok, 2, SitchWithOKTexts)); + Add(new cMenuEditStraItem(tr("Key to switch channel"), &switchwithok, 2, SitchWithOKTexts)); Add(new cMenuEditBoolItem(tr("Selected item centered"), &middlemenuentry)); Add(new cMenuEditStraItem(tr("Keys to switch channel group"), &switchgroupkey, 2, SwitchGroupKeyTexts)); @@ -122,6 +124,8 @@ bool cPluginNeutrinoEpg::Start(void) FirstGroupChannel[i] = -1; LastGroupChannel[i] = -1; } + ReloadFilters = true; + return true; } diff --git a/neutrinoepg.h b/neutrinoepg.h index 2ca36f2..be80bf2 100644 --- a/neutrinoepg.h +++ b/neutrinoepg.h @@ -32,11 +32,13 @@ static const char *VERSION = "0.3.2"; static const char *DESCRIPTION = "View the EPG like neutrino does"; static const char *MAINMENUENTRY = "Neutrino EPG"; +extern bool ReloadFilters; // --- cPluginNeutrinoEpg --------------------------------------------------- class cPluginNeutrinoEpg:public cPlugin { private: + public: cPluginNeutrinoEpg(void); virtual ~cPluginNeutrinoEpg(); @@ -66,9 +66,26 @@ myOsdMenu::myOsdMenu() : cOsdMenu("") ChannelsAfter = (ChannelsShown / 2)-1; } + if( ReloadFilters ) + { + ReloadFilters = false; + for( int i = 0; i < MaxGroup; i++) + { + CurrentGroupChannel[i] = -1; + FirstGroupChannel[i] = -1; + LastGroupChannel[i] = -1; + } + } + // what is the current watching channel? int CurrentChannelNr = cDevice::CurrentChannel(); cChannel *CurrentChannel = Channels.GetByNumber(CurrentChannelNr); + // is Current Channel is filtered? + bool isRadio = ( (!CurrentChannel->Vpid()) && (CurrentChannel->Apid(0)) ) ? true : false; + if( (isRadio && hideradiochannels) || (CurrentChannel->Ca() && hideencryptedchannels) ) + { + CurrentChannel = Channels.Get( GetNextChannel( CurrentChannel->Index() ) ); + } // what is the current channel & group? CurrentGroup = GetGroupFromChannel( CurrentChannel->Index() ); CurrentGroupChannel[CurrentGroup] = CurrentChannel->Index(); diff --git a/po/de_DE.po b/po/de_DE.po index 8a66c4d..56b571a 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutrinoepg-Plugin 0.3.2\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2013-04-11 18:50+0200\n" +"POT-Creation-Date: 2013-04-12 09:54+0200\n" "PO-Revision-Date: 2008-03-30 19:58+0200\n" "Last-Translator: \n" "Language-Team: <nordlicht@martins-kabuff.de>\n" @@ -52,8 +52,8 @@ msgstr "Sprungweite (min)" msgid "Favorite time" msgstr "Favoriten Zeit" -msgid "Switch with OK" -msgstr "" +msgid "Key to switch channel" +msgstr "Taste zum Umschalten" msgid "Selected item centered" msgstr "ausgewählten Kanal mittig" @@ -90,6 +90,3 @@ msgstr "ohne Gruppe" msgid "Jump to" msgstr "Springe zu" - -#~ msgid "Key to switch channel" -#~ msgstr "Taste zum Umschalten" |