From 98d20a98bb9af692128c006feeb7ec9ec0976433 Mon Sep 17 00:00:00 2001 From: schmirl Date: Tue, 13 Oct 2009 06:48:23 +0000 Subject: [PATCH] improved PARENTALRATING patch detection was missing in this branch --- HISTORY | 1 + server/connectionVTP.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/HISTORY b/HISTORY index a57ff2d..e74822e 100644 --- a/HISTORY +++ b/HISTORY @@ -1,6 +1,7 @@ VDR Plugin 'streamdev' Revision History --------------------------------------- +- improved PARENTALRATING patch detection was missing in this branch - silenced warnings concerning asprintf (requested by Rolf Ahrenberg) - don't update recordings list on CmdPLAY (reported by BBlack) - adapted and included xmbc patch for VDR 1.4.x diff --git a/server/connectionVTP.c b/server/connectionVTP.c index 1ef9c47..84c4941 100644 --- a/server/connectionVTP.c +++ b/server/connectionVTP.c @@ -1,5 +1,5 @@ /* - * $Id: connectionVTP.c,v 1.18.2.4 2009/10/13 06:38:58 schmirl Exp $ + * $Id: connectionVTP.c,v 1.18.2.5 2009/10/13 06:48:23 schmirl Exp $ */ #include "server/connectionVTP.h" @@ -37,7 +37,7 @@ enum eDumpModeStreamdev { dmsdAll, dmsdPresent, dmsdFollowing, dmsdAtTime, dmsdF class cLSTEHandler { private: -#ifdef USE_PARENTALRATING +#if defined(USE_PARENTALRATING) || defined(PARENTALRATINGCONTENTVERSNUM) enum eStates { Channel, Event, Title, Subtitle, Description, Vps, Content, EndEvent, EndChannel, EndEPG }; #else @@ -282,7 +282,7 @@ bool cLSTEHandler::Next(bool &Last) break; case Vps: -#ifdef USE_PARENTALRATING +#if defined(USE_PARENTALRATING) || defined(PARENTALRATINGCONTENTVERSNUM) m_State = Content; #else m_State = EndEvent; @@ -297,7 +297,7 @@ bool cLSTEHandler::Next(bool &Last) return Next(Last); break; -#ifdef USE_PARENTALRATING +#if defined(USE_PARENTALRATING) || defined(PARENTALRATINGCONTENTVERSNUM) case Content: m_State = EndEvent; if (!isempty(m_Event->GetContentsString())) {