--- ../vdr-1.7.33/device.c 2012-11-19 10:59:09.000000000 +0100 +++ device.c 2012-12-10 10:14:03.106016736 +0100 @@ -721,6 +721,7 @@ 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; @@ -742,6 +743,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-1.7.33/menu.c 2012-12-07 14:48:15.000000000 +0100 +++ menu.c 2012-12-10 10:21:12.498031920 +0100 @@ -896,6 +896,17 @@ 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; + if (asprintf(&buf, "%s\t%s", tr("Childlock"), data.fskProtection ? tr("yes") : tr("no")) >= 0){ + Add(new cOsdItem(buf)); + free(buf); + } + } + Add(file = new cMenuEditStrItem( tr("File"), data.file, sizeof(data.file))); SetFirstDayItem(); } @@ -2285,7 +2296,10 @@ for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) { if (!base || (strstr(recording->Name(), base) == recording->Name() && recording->Name()[strlen(base)] == FOLDERDELIMCHAR)) { cMenuRecordingItem *Item = new cMenuRecordingItem(recording, level); - if (*Item->Text() && (!Item->IsDirectory() || (!LastItem || !LastItem->IsDirectory() || strcmp(Item->Text(), LastItemText) != 0))) { + + if (*Item->Text() && (!Item->IsDirectory() || (!LastItem || !LastItem->IsDirectory() || strcmp(Item->Text(), LastItemText) != 0)) + && (!cStatus::MsgReplayProtected(Item->Recording(), Item->Name(), base, + Item->IsDirectory(), true))) { // PIN PATCH Add(Item); LastItem = Item; free(LastItemText); @@ -2337,6 +2351,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 { @@ -3379,28 +3396,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); @@ -3469,6 +3490,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); @@ -3494,6 +3523,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()) @@ -3505,6 +3535,7 @@ } } } + } state = osEnd; } break; @@ -3675,6 +3706,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; } @@ -4324,6 +4356,7 @@ for (int i = 0; i < MAXRECORDCONTROLS; i++) { if (!RecordControls[i]) { RecordControls[i] = new cRecordControl(device, Timer, Pause); + cStatus::MsgRecordingFile(RecordControls[i]->FileName()); // PIN PATCH return RecordControls[i]->Process(time(NULL)); } } --- ../vdr-1.7.33/osd.c 2012-06-09 16:37:24.000000000 +0200 +++ osd.c 2012-12-10 10:14:03.110016736 +0100 @@ -1623,6 +1623,7 @@ int cOsd::osdHeight = 0; cVector cOsd::Osds; cMutex cOsd::mutex; +bool cOsd::pinValid = false; // PIN PATCH cOsd::cOsd(int Left, int Top, uint Level) { --- ../vdr-1.7.33/osd.h 2012-12-03 14:49:02.000000000 +0100 +++ osd.h 2012-12-10 10:14:03.114016736 +0100 @@ -931,6 +931,7 @@ ///< MyOsdDrawPixmap(Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y(), pm->Data(), w, h, h * d); ///< delete pm; ///< } + static bool pinValid; // PIN PATCH }; #define MAXOSDIMAGES 64 --- ../vdr-1.7.33/status.c 2012-03-07 15:17:24.000000000 +0100 +++ status.c 2012-12-10 10:14:03.114016736 +0100 @@ -124,3 +124,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, const cOsdObject* Interact) // PIN PATCH +{ + for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) + sm->UserAction(key, Interact); +} + +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-1.7.33/status.h 2012-03-07 15:16:57.000000000 +0100 +++ status.h 2012-12-10 10:14:03.114016736 +0100 @@ -14,6 +14,7 @@ #include "device.h" #include "player.h" #include "tools.h" +#include "plugin.h" enum eTimerChange { tcMod, tcAdd, tcDel }; @@ -81,6 +82,24 @@ // 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, const cOsdObject* Interact) {} // 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(); @@ -102,6 +121,15 @@ 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, const cOsdObject* Interact); + static bool MsgMenuItemProtected(const char* Name, int menuView = false); // PIN PATCH + }; #endif //__STATUS_H --- ../vdr-1.7.33/timers.c 2012-12-07 14:14:00.000000000 +0100 +++ timers.c 2012-12-10 10:14:03.114016736 +0100 @@ -78,6 +78,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()); if (VfatFileSystem && (Utf8StrLen(file) > VFAT_MAX_FILENAME)) { @@ -117,6 +118,7 @@ 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)); @@ -126,6 +128,7 @@ dsyslog("timer file name truncated to '%s'", file); } SetEvent(Event); + cStatus::MsgTimerCreation(this, Event); // PIN PATCH } cTimer::cTimer(const cTimer &Timer) @@ -161,6 +164,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; @@ -355,6 +359,7 @@ result = false; } } + fskProtection = aux && strstr(aux, "yes"); // PIN PATCH free(channelbuffer); free(daybuffer); free(filebuffer); @@ -713,6 +718,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 Timers; --- ../vdr-1.7.33/timers.h 2012-12-07 14:13:40.000000000 +0100 +++ timers.h 2012-12-10 10:14:03.114016736 +0100 @@ -38,6 +38,7 @@ int start; int stop; int priority; + int fskProtection; // PIN PATCH int lifetime; mutable char file[MaxFileName]; char *aux; @@ -59,6 +60,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; } @@ -95,6 +97,7 @@ void SetAux(const char *Aux); 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-1.7.33/vdr.c 2012-12-06 11:29:23.000000000 +0100 +++ vdr.c 2012-12-10 10:14:03.114016736 +0100 @@ -65,6 +65,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 @@ -947,6 +948,7 @@ cOsdObject *Interact = Menu ? Menu : cControl::Control(); eKeys key = Interface->GetKey(!Interact || !Interact->NeedsFastResponse()); if (ISREALKEY(key)) { + cStatus::MsgUserAction(key, Interact); // PIN PATCH EITScanner.Activity(); // Cancel shutdown countdown: if (ShutdownHandler.countdown) @@ -1019,10 +1021,12 @@ cControl::Control()->Hide(); cPlugin *plugin = cPluginManager::GetPlugin(PluginName); if (plugin) { + if (!cStatus::MsgPluginProtected(plugin)) { Menu = plugin->MainMenuAction(); if (Menu) Menu->Show(); } + } else esyslog("ERROR: unknown plugin '%s'", PluginName); } @@ -1235,9 +1239,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;