--- ../vdr-2.3.1.plain//device.c 2015-09-05 13:42:17.000000000 +0200 +++ device.c 2015-10-09 16:43:27.982132231 +0200 @@ -726,6 +726,7 @@ const cChannel *Channel; while ((Channel = Channels->GetByNumber(n, Direction)) != NULL) { // try only channels which are currently available + if (!cStatus::MsgChannelProtected(0, Channel)) // PIN PATCH if (GetDevice(Channel, LIVEPRIORITY, true, true)) break; n = Channel->Number() + Direction; @@ -747,6 +748,12 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView) { + // I hope 'LiveView = false' indicates a channel switch for recording, // PIN PATCH + // I really don't know, but it works ... // PIN PATCH + + if (LiveView && cStatus::MsgChannelProtected(this, Channel)) // PIN PATCH + return scrNotAvailable; // PIN PATCH + cStatus::MsgChannelSwitch(this, 0, LiveView); if (LiveView) { --- ../vdr-2.3.1.plain//Makefile 2015-02-09 13:28:24.000000000 +0100 +++ Makefile 2015-10-12 08:49:55.734546896 +0200 @@ -324,7 +324,7 @@ clean: @$(MAKE) --no-print-directory -C $(LSIDIR) clean @-rm -f $(OBJS) $(DEPFILE) vdr vdr.pc core* *~ - @-rm -rf $(LOCALEDIR) $(PODIR)/*.mo $(PODIR)/*.pot + @-rm -rf $(LOCALEDIR) $(PODIR)/*~ $(PODIR)/*.mo $(PODIR)/*.pot @-rm -rf include @-rm -rf srcdoc CLEAN: clean --- ../vdr-2.3.1.plain//menu.c 2015-09-14 15:22:49.000000000 +0200 +++ menu.c 2015-10-09 16:26:16.481017293 +0200 @@ -997,6 +997,18 @@ Add(new cMenuEditBitItem( tr("VPS"), &data.flags, tfVps)); Add(new cMenuEditIntItem( tr("Priority"), &data.priority, 0, MAXPRIORITY)); Add(new cMenuEditIntItem( tr("Lifetime"), &data.lifetime, 0, MAXLIFETIME)); + + // PIN PATCH + if (cOsd::pinValid || !data.fskProtection) Add(new cMenuEditBoolItem(tr("Childlock"),&data.fskProtection)); + else { + char* buf = 0; + int res = 0; + res = asprintf(&buf, "%s\t%s", tr("Childlock"), data.fskProtection ? tr("yes") : tr("no")); + if (res < 0) ; // memory problems :o + Add(new cOsdItem(buf)); + free(buf); + } + Add(file = new cMenuEditStrItem( tr("File"), data.file, sizeof(data.file))); SetFirstDayItem(); if (data.remote) @@ -2973,7 +2985,8 @@ } } } - if (*Item->Text() && !LastDir) { + if (*Item->Text() && !LastDir + && (!cStatus::MsgReplayProtected(Item->Recording(), Item->Name(), base, Item->IsDirectory(), true))) { // PIN PATCH Add(Item); LastItem = Item; if (Item->IsDirectory()) @@ -3041,6 +3054,9 @@ { cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current()); if (ri) { + if (cStatus::MsgReplayProtected(ri->Recording(), ri->Name(), base, + ri->IsDirectory()) == true) // PIN PATCH + return osContinue; // PIN PATCH if (ri->IsDirectory()) Open(); else { @@ -4282,28 +4298,32 @@ // Basic menu items: - Add(new cOsdItem(hk(tr("Schedule")), osSchedule)); - Add(new cOsdItem(hk(tr("Channels")), osChannels)); - Add(new cOsdItem(hk(tr("Timers")), osTimers)); - Add(new cOsdItem(hk(tr("Recordings")), osRecordings)); + // PIN PATCH + if (!cStatus::MsgMenuItemProtected("Schedule", true)) Add(new cOsdItem(hk(tr("Schedule")), osSchedule)); + if (!cStatus::MsgMenuItemProtected("Channels", true)) Add(new cOsdItem(hk(tr("Channels")), osChannels)); + if (!cStatus::MsgMenuItemProtected("Timers", true)) Add(new cOsdItem(hk(tr("Timers")), osTimers)); + if (!cStatus::MsgMenuItemProtected("Recordings", true)) Add(new cOsdItem(hk(tr("Recordings")), osRecordings)); // Plugins: for (int i = 0; ; i++) { cPlugin *p = cPluginManager::GetPlugin(i); if (p) { + if (!cStatus::MsgPluginProtected(p, true)) { // PIN PATCH const char *item = p->MainMenuEntry(); if (item) Add(new cMenuPluginItem(hk(item), i)); } + } else break; } // More basic menu items: - Add(new cOsdItem(hk(tr("Setup")), osSetup)); + if (!cStatus::MsgMenuItemProtected("Setup", true)) Add(new cOsdItem(hk(tr("Setup")), osSetup)); // PIN PATCH if (Commands.Count()) + if (!cStatus::MsgMenuItemProtected("Commands", true)) // PIN PATCH Add(new cOsdItem(hk(tr("Commands")), osCommands)); Update(true); @@ -4372,6 +4392,14 @@ eOSState state = cOsdMenu::ProcessKey(Key); HadSubMenu |= HasSubMenu(); + // > PIN PATCH + cOsdItem* item = Get(Current()); + + if (item && item->Text() && state != osContinue && state != osUnknown && state != osBack) + if (cStatus::MsgMenuItemProtected(item->Text())) + return osContinue; + // PIN PATCH < + switch (state) { case osSchedule: return AddSubMenu(new cMenuSchedule); case osChannels: return AddSubMenu(new cMenuChannels); @@ -4396,6 +4424,7 @@ if (item) { cPlugin *p = cPluginManager::GetPlugin(item->PluginIndex()); if (p) { + if (!cStatus::MsgPluginProtected(p)) { // PIN PATCH cOsdObject *menu = p->MainMenuAction(); if (menu) { if (menu->IsMenu()) @@ -4407,6 +4436,7 @@ } } } + } state = osEnd; } break; @@ -4576,6 +4606,7 @@ Channel = Direction > 0 ? Channels->Next(Channel) : Channels->Prev(Channel); if (!Channel && Setup.ChannelsWrap) Channel = Direction > 0 ? Channels->First() : Channels->Last(); + if (!cStatus::MsgChannelProtected(0, Channel)) // PIN PATCH if (Channel && !Channel->GroupSep() && cDevice::GetDevice(Channel, LIVEPRIORITY, true, true)) return Channel; } @@ -5226,6 +5257,7 @@ for (int i = 0; i < MAXRECORDCONTROLS; i++) { if (!RecordControls[i]) { RecordControls[i] = new cRecordControl(device, Timers, Timer, Pause); + cStatus::MsgRecordingFile(RecordControls[i]->FileName()); // PIN PATCH return RecordControls[i]->Process(time(NULL)); } } --- ../vdr-2.3.1.plain//osd.c 2015-09-10 16:12:06.000000000 +0200 +++ osd.c 2015-10-09 16:10:13.400241634 +0200 @@ -1644,6 +1644,7 @@ cSize cOsd::maxPixmapSize(2048, 2048); cVector cOsd::Osds; cMutex cOsd::mutex; +bool cOsd::pinValid = false; // PIN PATCH cOsd::cOsd(int Left, int Top, uint Level) { --- ../vdr-2.3.1.plain//osd.h 2015-04-19 14:18:25.000000000 +0200 +++ osd.h 2015-10-09 16:10:13.400241634 +0200 @@ -952,6 +952,7 @@ ///< ///< If a plugin uses a derived cPixmap implementation, it needs to use that ///< type instead of cPixmapMemory. + static bool pinValid; // PIN PATCH }; #define MAXOSDIMAGES 64 --- ../vdr-2.3.1.plain//status.c 2014-01-25 11:47:39.000000000 +0100 +++ status.c 2015-10-12 10:41:28.695735498 +0200 @@ -130,3 +130,55 @@ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) sm->OsdProgramme(PresentTime, PresentTitle, PresentSubtitle, FollowingTime, FollowingTitle, FollowingSubtitle); } + +bool cStatus::MsgChannelProtected(const cDevice* Device, const cChannel* Channel) // PIN PATCH +{ + for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) + if (sm->ChannelProtected(Device, Channel) == true) + return true; + + return false; +} + +bool cStatus::MsgReplayProtected(const cRecording* Recording, const char* Name, + const char* Base, bool isDirectory, int menuView) // PIN PATCH +{ + for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) + if (sm->ReplayProtected(Recording, Name, Base, isDirectory, menuView) == true) + return true; + return false; +} + +void cStatus::MsgRecordingFile(const char* FileName) +{ + for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) // PIN PATCH + sm->RecordingFile(FileName); +} + +void cStatus::MsgTimerCreation(cTimer* Timer, const cEvent *Event) +{ + for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) // PIN PATCH + sm->TimerCreation(Timer, Event); +} + +bool cStatus::MsgPluginProtected(cPlugin* Plugin, int menuView) // PIN PATCH +{ + for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) + if (sm->PluginProtected(Plugin, menuView) == true) + return true; + return false; +} + +void cStatus::MsgUserAction(const eKeys key) // PIN PATCH +{ + for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) + sm->UserAction(key); +} + +bool cStatus::MsgMenuItemProtected(const char* Name, int menuView) // PIN PATCH +{ + for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) + if (sm->MenuItemProtected(Name, menuView) == true) + return true; + return false; +} --- ../vdr-2.3.1.plain//status.h 2015-08-02 12:34:44.000000000 +0200 +++ status.h 2015-10-12 10:41:15.287669011 +0200 @@ -14,6 +14,7 @@ #include "device.h" #include "player.h" #include "tools.h" +#include "plugin.h" enum eTimerChange { tcMod, tcAdd, tcDel }; // tcMod is obsolete and no longer used! @@ -81,6 +82,23 @@ // The OSD displays the single line Text with the current channel information. virtual void OsdProgramme(time_t PresentTime, const char *PresentTitle, const char *PresentSubtitle, time_t FollowingTime, const char *FollowingTitle, const char *FollowingSubtitle) {} // The OSD displays the given programme information. + virtual bool ChannelProtected(const cDevice *Device, const cChannel* Channel) { return false; } // PIN PATCH + // Checks if a channel is protected. + virtual bool ReplayProtected(const cRecording* Recording, const char* Name, + const char* Base, bool isDirectory, int menuView = false) { return false; } // PIN PATCH + // Checks if a recording is protected. + virtual void RecordingFile(const char* FileName) {} // PIN PATCH + // The given DVB device has started recording to FileName. FileName is the name of the + // recording directory + virtual void TimerCreation(cTimer* Timer, const cEvent *Event) {} // PIN PATCH + // The given timer is created + virtual bool PluginProtected(cPlugin* Plugin, int menuView = false) { return false; } // PIN PATCH + // Checks if a plugin is protected. + virtual void UserAction(const eKeys key) {} // PIN PATCH + // report user action + virtual bool MenuItemProtected(const char* Name, int menuView = false) { return false; } // PIN PATCH + // Checks if a menu entry is protected. + public: cStatus(void); virtual ~cStatus(); @@ -103,6 +121,14 @@ static void MsgOsdTextItem(const char *Text, bool Scroll = false); static void MsgOsdChannel(const char *Text); static void MsgOsdProgramme(time_t PresentTime, const char *PresentTitle, const char *PresentSubtitle, time_t FollowingTime, const char *FollowingTitle, const char *FollowingSubtitle); + static bool MsgChannelProtected(const cDevice* Device, const cChannel* Channel); // PIN PATCH + static bool MsgReplayProtected(const cRecording* Recording, const char* Name, + const char* Base, bool isDirectory, int menuView = false); // PIN PATCH + static void MsgRecordingFile(const char* FileName); // PIN PATCH + static void MsgTimerCreation(cTimer* Timer, const cEvent *Event); // PIN PATCH + static bool MsgPluginProtected(cPlugin* Plugin, int menuView = false); // PIN PATCH + static void MsgUserAction(const eKeys key); // PIN PATCH + static bool MsgMenuItemProtected(const char* Name, int menuView = false); // PIN PATCH }; #endif //__STATUS_H --- ../vdr-2.3.1.plain//timers.c 2015-09-13 15:10:24.000000000 +0200 +++ timers.c 2015-10-09 16:10:13.404241653 +0200 @@ -77,6 +77,7 @@ stop -= 2400; priority = Pause ? Setup.PausePriority : Setup.DefaultPriority; lifetime = Pause ? Setup.PauseLifetime : Setup.DefaultLifetime; + fskProtection = 0; // PIN PATCH if (Instant && channel) snprintf(file, sizeof(file), "%s%s", Setup.MarkInstantRecord ? "@" : "", *Setup.NameInstantRecord ? Setup.NameInstantRecord : channel->Name()); } @@ -114,10 +115,12 @@ stop -= 2400; priority = Setup.DefaultPriority; lifetime = Setup.DefaultLifetime; + fskProtection = 0; // PIN PATCH const char *Title = Event->Title(); if (!isempty(Title)) Utf8Strn0Cpy(file, Event->Title(), sizeof(file)); SetEvent(Event); + cStatus::MsgTimerCreation(this, Event); // PIN PATCH } cTimer::cTimer(const cTimer &Timer) @@ -156,6 +159,7 @@ stop = Timer.stop; priority = Timer.priority; lifetime = Timer.lifetime; + fskProtection = Timer.fskProtection; // PIN PATCH strncpy(file, Timer.file, sizeof(file)); free(aux); aux = Timer.aux ? strdup(Timer.aux) : NULL; @@ -344,6 +348,7 @@ result = false; } } + fskProtection = aux && strstr(aux, "yes"); // PIN PATCH free(channelbuffer); free(daybuffer); free(filebuffer); @@ -708,6 +713,36 @@ Matches(); // refresh start and end time } +void cTimer::SetFskProtection(int aFlag) // PIN PATCH +{ + char* p; + char* tmp = 0; + int res = 0; + + fskProtection = aFlag; + + if (fskProtection && (!aux || !strstr(aux, "yes"))) + { + // add protection info to aux + + if (aux) { tmp = strdup(aux); free(aux); } + res = asprintf(&aux, "%syes", tmp ? tmp : ""); + } + else if (!fskProtection && aux && (p = strstr(aux, "yes"))) + { + // remove protection info from aux + + res = asprintf(&tmp, "%.*s%s", (int)(p-aux), aux, p+strlen("yes")); + free(aux); + aux = strdup(tmp); + } + + if (res < 0) ; // memory problems :o + + if (tmp) + free(tmp); +} + // --- cTimers --------------------------------------------------------------- cTimers cTimers::timers; --- ../vdr-2.3.1.plain//timers.h 2015-09-09 12:40:24.000000000 +0200 +++ timers.h 2015-10-09 16:10:13.404241653 +0200 @@ -39,6 +39,7 @@ int start; int stop; int priority; + int fskProtection; // PIN PATCH int lifetime; mutable char file[NAME_MAX * 2 + 1]; // *2 to be able to hold 'title' and 'episode', which can each be up to 255 characters long char *aux; @@ -62,6 +63,7 @@ int Start(void) const { return start; } int Stop(void) const { return stop; } int Priority(void) const { return priority; } + int FskProtection(void) const { return fskProtection; } // PIN PATCH int Lifetime(void) const { return lifetime; } const char *File(void) const { return file; } time_t FirstDay(void) const { return weekdays ? day : 0; } @@ -102,6 +104,7 @@ void SetRemote(const char *Remote); void SetDeferred(int Seconds); void SetFlags(uint Flags); + void SetFskProtection(int aFlag); // PIN PATCH void ClrFlags(uint Flags); void InvFlags(uint Flags); bool HasFlags(uint Flags) const; --- ../vdr-2.3.1.plain//vdr.c 2015-09-11 10:02:50.000000000 +0200 +++ vdr.c 2015-10-12 10:40:33.159460108 +0200 @@ -71,6 +71,7 @@ #include "tools.h" #include "transfer.h" #include "videodir.h" +#include "status.h" // PIN PATCH #define MINCHANNELWAIT 10 // seconds to wait between failed channel switchings #define ACTIVITYTIMEOUT 60 // seconds before starting housekeeping @@ -1153,6 +1154,7 @@ cOsdObject *Interact = Menu ? Menu : cControl::Control(); eKeys key = Interface->GetKey(!Interact || !Interact->NeedsFastResponse()); if (ISREALKEY(key)) { + cStatus::MsgUserAction(key); // PIN PATCH EITScanner.Activity(); // Cancel shutdown countdown: if (ShutdownHandler.countdown) @@ -1225,10 +1227,12 @@ cControl::Control()->Hide(); cPlugin *plugin = cPluginManager::GetPlugin(PluginName); if (plugin) { + if (!cStatus::MsgPluginProtected(plugin)) { // PIN PATCH Menu = plugin->MainMenuAction(); if (Menu) Menu->Show(); } + } else esyslog("ERROR: unknown plugin '%s'", PluginName); } @@ -1446,9 +1450,11 @@ // Instant resume of the last viewed recording: case kPlay: if (cReplayControl::LastReplayed()) { + if (cStatus::MsgReplayProtected(0, cReplayControl::LastReplayed(), 0, false) == false) { // PIN PATCH cControl::Shutdown(); cControl::Launch(new cReplayControl); } + } else DirectMainFunction(osRecordings); // no last viewed recording, so enter the Recordings menu break;