From patchwork Mon Feb 13 12:47:16 2006
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Peter Juszack <vdr@unterbrecher.de>
X-Patchwork-Id: 12203
Received: from natipslore.rzone.de ([81.169.145.179])
	by www.linuxtv.org with esmtp (Exim 4.50) id 1F8d6t-0002kw-0A
	for vdr@linuxtv.org; Mon, 13 Feb 2006 13:47:19 +0100
Received: from [192.168.50.4] (dialin-145-254-064-124.pools.arcor-ip.net
	[145.254.64.124]) (authenticated bits=0)
	by post.webmailer.de (8.13.1/8.13.1) with ESMTP id k1DClD7K003914
	for <vdr@linuxtv.org>; Mon, 13 Feb 2006 13:47:17 +0100 (MET)
Message-ID: <43F07FD4.7090505@unterbrecher.de>
Date: Mon, 13 Feb 2006 13:47:16 +0100
From: Peter Juszack <vdr@unterbrecher.de>
User-Agent: Debian Thunderbird 1.0.2 (X11/20050331)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: "Klaus Schmidinger's VDR" <vdr@linuxtv.org>
Subject: [vdr] Problem with text2skin and DeepBlue since VDR 1.3.38
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: VDR Mailing List <vdr@linuxtv.org>
List-Id: VDR Mailing List <vdr.linuxtv.org>
List-Unsubscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=unsubscribe>
List-Archive: <http://www.linuxtv.org/pipermail/vdr>
List-Post: <mailto:vdr@linuxtv.org>
List-Help: <mailto:vdr-request@linuxtv.org?subject=help>
List-Subscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Feb 2006 12:47:19 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 7843

Hallo,

    I found the reason for missing replay logos with text2skin, DeepBlue 
and VDR > 1.3.37

Parameters 'FileName' and 'On' where added to the functions 
cStatus::Replaying and cStatus::Recording.
Text2Skin's class cText2Skin is derived from cStatus and overrides these 
functions. Since the new
parameters where not added in text2skin the base implementation of 
cStatus is called and
text2skin specific tasks, like determining the replay source (recording, 
DVD, mp3 etc.) is not done.

The attached patch fixes that by adding the new parameters to 
cText2SkinStatus::Replaying and
cText2SkinStatus::Recording.

The patch works against text2skin CVS version

Regards Peter

http://turku.wi-bw.tfh-wildau.de/~pjuszack/digicam
http://www.unterbrecher.de

diff -Naur text2skin-old/status.c text2skin-cvs/status.c
--- text2skin-old/status.c	2006-02-13 13:30:32.000000000 +0100
+++ text2skin-cvs/status.c	2006-02-13 13:29:20.000000000 +0100
@@ -29,8 +29,12 @@
 	mNextRecording    = 0;
 }
 
-void cText2SkinStatus::Replaying(const cControl* /*Control*/, const char *Name) {
+void cText2SkinStatus::Replaying(const cControl* /*Control*/, const char *Name, const char* FileName, bool On) {
 	Dprintf("cText2SkinStatus::Replaying(%s)\n", Name);
+	
+	if (!On)
+	    return;
+	
 	eReplayMode oldMode = mReplayMode;
 
 	if (mRender != NULL)
@@ -83,8 +87,11 @@
 	}
 }
 
-void cText2SkinStatus::Recording(const cDevice *Device, const char *Name) 
+void cText2SkinStatus::Recording(const cDevice *Device, const char *Name, const char* FileName, bool On) 
 {
+	if (!On)
+	    return;
+	    
 	if (mRender != NULL)
 		mRender->UpdateLock();
 
diff -Naur text2skin-old/status.h text2skin-cvs/status.h
--- text2skin-old/status.h	2006-02-13 13:30:32.000000000 +0100
+++ text2skin-cvs/status.h	2006-02-13 13:29:20.000000000 +0100
@@ -39,8 +39,8 @@
 	int               mLastLanguage;
 
 protected:
-	virtual void Replaying(const cControl *Control, const char *Name);
-	virtual void Recording(const cDevice *Device, const char *Name);
+	virtual void Replaying(const cControl *Control, const char *Name, const char* FileName, bool On);
+	virtual void Recording(const cDevice *Device, const char *Name, const char* FileName, bool On);
 	virtual void OsdClear(void);
 
 public: