From patchwork Sat Apr  9 20:09:27 2005
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Anssi Hannula <anssi.hannula@gmail.com>
X-Patchwork-Id: 11852
Received: from fep18.inet.fi ([194.251.242.243])
	by www.linuxtv.org with esmtp (Exim 4.34) id 1DKMGR-0000wU-RN
	for vdr@linuxtv.org; Sat, 09 Apr 2005 22:09:07 +0200
Received: from posti.hopto.org ([80.223.77.223]) by fep18.inet.fi with ESMTP
	id <20050409200906.SDGU27282.fep18.inet.fi@posti.hopto.org>
	for <vdr@linuxtv.org>; Sat, 9 Apr 2005 23:09:06 +0300
Received: from [10.0.0.3] (kone [10.0.0.3])
	by posti.hopto.org (Postfix) with ESMTP id 358503038094
	for <vdr@linuxtv.org>; Sat,  9 Apr 2005 23:09:07 +0300 (EEST)
Message-ID: <42583677.8090408@gmail.com>
Date: Sat, 09 Apr 2005 23:09:27 +0300
From: Anssi Hannula <anssi.hannula@gmail.com>
User-Agent: Mozilla Thunderbird 1.0 (X11/20050215)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Klaus Schmidinger's VDR <vdr@linuxtv.org>
Subject: [vdr] [PATCH] wapd-0.7a for vdr-1.3.23
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Klaus Schmidinger's VDR <vdr@linuxtv.org>
List-Id: Klaus Schmidinger's VDR <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, 09 Apr 2005 20:09:08 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 1495

Hi!

This patch enables wapd-0.7a to compile under vdr-1.3.23.
To be honest, I didn't quite understand the changed functionality, so 
someone might want to confirm that the patch is correct ;)

--- wapd-0.7a-old/server.c	2005-02-19 13:08:05.000000000 +0200
+++ wapd-0.7a/server.c	2005-04-09 22:57:15.000000000 +0300
@@ -481,7 +481,11 @@ void cWapServer::EditTimer(void)
            flags = timer->Active() ? 1 : 0;
 #endif
            channel_nr = timer->Channel()->Number();
+#if VDRVERSNUM >= 10323
+           day = strdup(timer->PrintDay(0, timer->WeekDays()));
+#else
            day = strdup(timer->PrintDay(timer->Day()));
+#endif
            start = timer->Start();
            stop = timer->Stop();
            priority = timer->Priority();
@@ -956,7 +960,9 @@ void cWapServer::PageTimers(void)
                  timer->Stop() / 100,
                  timer->Stop() % 100,
                  timer->Channel()->Number(),
-#if VDRVERSNUM >= 10318
+#if VDRVERSNUM >= 10323
+                 *timer->PrintDay(0, timer->WeekDays()),
+#elif VDRVERSNUM >= 10318
                  *timer->PrintDay(timer->Day()),
 #else
                  timer->PrintDay(timer->Day()),