summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmirl <schmirl>2009-10-13 06:48:23 +0000
committerschmirl <schmirl>2009-10-13 06:48:23 +0000
commit98d20a98bb9af692128c006feeb7ec9ec0976433 (patch)
tree72537e547bf49bf4646e26ef78846e5aaa83f207
parent824a19257976d5ff482969cfe4a7c7cf8a7fc16d (diff)
downloadvdr-plugin-streamdev-98d20a98bb9af692128c006feeb7ec9ec0976433.tar.gz
vdr-plugin-streamdev-98d20a98bb9af692128c006feeb7ec9ec0976433.tar.bz2
improved PARENTALRATING patch detection was missing in this branch
-rw-r--r--HISTORY1
-rw-r--r--server/connectionVTP.c8
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())) {