From 396fc43bddac7919ad37d89393210e5859da4850 Mon Sep 17 00:00:00 2001
From: Frank Schmirler <vdr@schmirler.de>
Date: Thu, 2 Dec 2010 09:46:09 +0100
Subject: [PATCH] Snapshot 2009-07-02

---
 CONTRIBUTORS           | 2 +-
 common.c               | 2 +-
 server/connectionVTP.c | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 6b2c092..647fee9 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -34,7 +34,7 @@ Rolf Ahrenberg
   for replacing private members by cThread::Running()/Active()
   for improving externremux script termination
   for fixing PAT repacker version field
-  for correcting LIMIKUUTIO patch detection
+  for improving LIMIKUUTIO and PARENTALRATING patch detection
 
 Rantanen Teemu
   for providing vdr-incompletesections.diff
diff --git a/common.c b/common.c
index 1d65138..a31dacf 100644
--- a/common.c
+++ b/common.c
@@ -10,7 +10,7 @@
 
 using namespace std;
 
-const char *VERSION = "0.5.0-pre-20090701";
+const char *VERSION = "0.5.0-pre-20090702";
 
 const char *StreamTypes[st_Count] = {
 	"TS",
diff --git a/server/connectionVTP.c b/server/connectionVTP.c
index 579cff2..6037ecc 100644
--- a/server/connectionVTP.c
+++ b/server/connectionVTP.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: connectionVTP.c,v 1.21 2009/07/01 10:46:16 schmirl Exp $
+ *  $Id: connectionVTP.c,v 1.22 2009/07/02 06:03:51 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
@@ -285,7 +285,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;
@@ -300,7 +300,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())) {