From patchwork Sat Dec 17 15:06:59 2005
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Chris Warren <dvb@ixalon.net>
X-Patchwork-Id: 12123
Received: from smtp-out1.blueyonder.co.uk ([195.188.213.4])
	by www.linuxtv.org with esmtp (Exim 4.50) id 1EndeJ-0001ZY-9g
	for vdr@linuxtv.org; Sat, 17 Dec 2005 16:07:03 +0100
Received: from VAIO ([82.41.49.97]) by smtp-out1.blueyonder.co.uk with
	Microsoft SMTPSVC(5.0.2195.6713); Sat, 17 Dec 2005 15:07:57 +0000
From: "Chris Warren" <dvb@ixalon.net>
To: <vdr@linuxtv.org>
Date: Sat, 17 Dec 2005 15:06:59 -0000
Message-ID: <021d01c6031b$877d6460$0200a8c0@VAIO>
MIME-Version: 1.0
X-Mailer: Microsoft Office Outlook 11
Thread-Index: AcYDG1NzSXTQgqIdRGWdN11uQkS8VwAACNiA
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2180
In-Reply-To: 
X-OriginalArrivalTime: 17 Dec 2005 15:07:57.0643 (UTC)
	FILETIME=[A9EBA1B0:01C6031B]
Subject: [vdr] [PATCH] text2skin - show partial channel numbers whilst
	changing channels
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: Sat, 17 Dec 2005 15:07:03 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 6696

Hi all,

Please find attached a patch against the latest CVS version of the text2skin
plugin which makes it show partial channel numbers whilst changing channels.

The ChannelNumber(const cChannel *Channel, int Number) function performs a
check for Channel being null and displays the partial channel number
appended by "-" when it is. However it's never called when Channel is null
due to a check in display.c.

Chris

--- text2skin.orig/display.c    2005-12-17 14:56:22.637342464 +0000
+++ text2skin/display.c 2005-12-17 14:56:56.975122328 +0000
@@ -116,9 +116,7 @@
 {
        switch (Token.Type) {
        case tChannelNumber:
-               return mChannel != NULL
-                      ? (cxType)ChannelNumber(mChannel, mNumber)
-                      : (cxType)false;
+               return ChannelNumber(mChannel, mNumber);

        case tChannelName:
                return mChannel != NULL