diff options
| -rw-r--r-- | HISTORY.h | 7 | ||||
| -rw-r--r-- | epg2vdr.c | 3 | ||||
| -rw-r--r-- | menusched.c | 2 | ||||
| -rw-r--r-- | plgconfig.h | 6 |
4 files changed, 11 insertions, 7 deletions
@@ -5,8 +5,8 @@ * */ -#define _VERSION "1.1.98" -#define VERSION_DATE "15.10.2018" +#define _VERSION "1.1.99" +#define VERSION_DATE "28.10.2019" #define DB_API 7 @@ -19,6 +19,9 @@ /* * ------------------------------------ +2019-10-28 version 1.1.99 (horchi) + - added: Option to keep menu on channel switch open + 2018-10-15 version 1.1.98 (horchi) - bugfix: Fixed init of dummy separator items for EPG menu @@ -292,6 +292,7 @@ void cMenuSetupEPG2VDR::Setup() Add(new cMenuEditBoolItem(tr("Replace Timer Menu"), &data.replaceTimerMenu)); Add(new cMenuEditBoolItem(tr("XChange Key Ok/Blue"), &data.xchgOkBlue)); Add(new cMenuEditBoolItem(tr("Show Channels without EPG"), &data.showEmptyChannels)); + Add(new cMenuEditBoolItem(tr("Close Menu on Channel Switch (at blue key)"), &data.closeOnSwith)); Add(new cMenuEditIntItem(tr("Switch timer notification timer [s]"), &data.switchTimerNotifyTime, 0, 999)); Add(new cOsdItem(cString::sprintf("--------------------- %s ---------------------------------", tr("Web")))); @@ -372,6 +373,7 @@ void cMenuSetupEPG2VDR::Store() SetupStore("CreateTimerLocal", Epg2VdrConfig.createTimerLocal); SetupStore("XChgKeyOkBlue", Epg2VdrConfig.xchgOkBlue); SetupStore("ShowEmptyChannels", Epg2VdrConfig.showEmptyChannels); + SetupStore("CloseOnSwith", Epg2VdrConfig.closeOnSwith); SetupStore("UseCommonRecFolder", Epg2VdrConfig.useCommonRecFolder); SetupStore("ReplaceScheduleMenu", Epg2VdrConfig.replaceScheduleMenu); SetupStore("ReplaceTimerMenu", Epg2VdrConfig.replaceTimerMenu); @@ -1146,6 +1148,7 @@ bool cPluginEPG2VDR::SetupParse(const char *Name, const char *Value) else if (!strcasecmp(Name, "CreateTimerLocal")) Epg2VdrConfig.createTimerLocal = atoi(Value); else if (!strcasecmp(Name, "XChgKeyOkBlue")) Epg2VdrConfig.xchgOkBlue = atoi(Value); else if (!strcasecmp(Name, "ShowEmptyChannels")) Epg2VdrConfig.showEmptyChannels = atoi(Value); + else if (!strcasecmp(Name, "CloseOnSwith")) Epg2VdrConfig.closeOnSwith = atoi(Value); else if (!strcasecmp(Name, "Uuid")) sstrcpy(Epg2VdrConfig.uuid, Value, sizeof(Epg2VdrConfig.uuid)); else if (!strcasecmp(Name, "NetDevice")) sstrcpy(Epg2VdrConfig.netDevice, Value, sizeof(Epg2VdrConfig.netDevice)); else if (!strcasecmp(Name, "ReplaceScheduleMenu")) Epg2VdrConfig.replaceScheduleMenu = atoi(Value); diff --git a/menusched.c b/menusched.c index 404e9fd..8bfce4b 100644 --- a/menusched.c +++ b/menusched.c @@ -1013,7 +1013,7 @@ eOSState cMenuEpgWhatsOn::Switch() cMenuEpgScheduleItem* item = (cMenuEpgScheduleItem*)Get(Current()); if (cDevice::PrimaryDevice()->SwitchChannel(item->channel, true)) - return osEnd; + return Epg2VdrConfig.closeOnSwith ? osEnd : osContinue; Skins.Message(mtError, tr("Can't switch channel!")); diff --git a/plgconfig.h b/plgconfig.h index daff92d..46d4d10 100644 --- a/plgconfig.h +++ b/plgconfig.h @@ -6,8 +6,7 @@ * $Id: config.h,v 1.2 2012/10/26 08:44:13 wendel Exp $ */ -#ifndef __EPG2VDR_CONFIG_H -#define __EPG2VDR_CONFIG_H +#pragma once #include "lib/config.h" @@ -39,8 +38,7 @@ struct cEpg2VdrConfig : public cEpgConfig int showEmptyChannels; int extendedEpgData2Aux; int switchTimerNotifyTime; + int closeOnSwith {no}; }; extern cEpg2VdrConfig Epg2VdrConfig; - -#endif // __EPG2VDR_CONFIG_H |