From patchwork Sun Jun 18 17:04:47 2006 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Halim Sahin X-Patchwork-Id: 12338 Received: from as-7.de ([80.190.252.16] helo=mail.as-6.de) by www.linuxtv.org with esmtp (Exim 4.50) id 1Fs0he-0007Zr-K1 for vdr@linuxtv.org; Sun, 18 Jun 2006 19:04:50 +0200 Received: from localhost (localhost [127.0.0.1]) by mail.as-6.de (Postfix) with ESMTP id 87A019284AA for ; Sun, 18 Jun 2006 19:04:50 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail.as-6.de Received: from mail.as-6.de ([127.0.0.1]) by localhost (mail.as-6.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id U4HsBAgZS9Qf for ; Sun, 18 Jun 2006 19:04:50 +0200 (CEST) Received: from halim.local (p54AEE7AF.dip.t-dialin.net [84.174.231.175]) by mail.as-6.de (Postfix) with ESMTP id 3B27792810E for ; Sun, 18 Jun 2006 19:04:48 +0200 (CEST) Received: by halim.local (Postfix, from userid 1000) id A233A1BB3C0; Sun, 18 Jun 2006 19:04:47 +0200 (CEST) Date: Sun, 18 Jun 2006 19:04:47 +0200 From: Halim Sahin To: vdr@linuxtv.org Message-ID: <20060618170447.GA17784@halim.local> Mime-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.6+20040907i Subject: [vdr] [PATCH] vcd plugin X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: VDR Mailing List List-Id: VDR Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jun 2006 17:04:50 -0000 Status: O X-Status: X-Keywords: X-UID: 9827 Hello, I found no patches for the vcd plugin to get it work with vdr-1.4.x So I tried to make one. Here it is Best regards Halim diff -Nur vcd-0.7-orig/Makefile vcd-0.7/Makefile --- vcd-0.7-orig/Makefile 2005-01-26 22:23:47.000000000 +0100 +++ vcd-0.7/Makefile 2006-06-18 18:57:50.000000000 +0200 @@ -21,9 +21,8 @@ LIBDIR = ../../lib TMPDIR = /tmp -### The version number of VDR (taken from VDR's "config.h"): - -VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') +### The version number of VDR's plugin API (taken from VDR's "config.h"): +APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') ### The name of the distribution archive: @@ -73,7 +72,7 @@ libvdr-$(PLUGIN).so: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ - @cp $@ $(LIBDIR)/$@.$(VDRVERSION) + @cp $@ $(LIBDIR)/$@.$(APIVERSION) dist: clean @-rm -rf $(TMPDIR)/$(ARCHIVE) diff -Nur vcd-0.7-orig/menucontrol.c vcd-0.7/menucontrol.c --- vcd-0.7-orig/menucontrol.c 2005-01-28 16:06:48.000000000 +0100 +++ vcd-0.7/menucontrol.c 2006-06-18 18:47:47.000000000 +0200 @@ -39,7 +39,11 @@ cMenuSpiControl::~cMenuSpiControl() { - cStatus::MsgReplaying(this, NULL); +#if VDRVERSNUM >= 10337 + cStatus::MsgReplaying(this, NULL, NULL, false); +#else +cStatus::MsgReplaying(this, NULL); +#endif Stop(); } @@ -118,13 +122,21 @@ lastSpeed = -1; timeoutShow = 0; timeSearchActive = false; - cStatus::MsgReplaying(this, "VCD"); -} +#if VDRVERSNUM >= 10337 +cStatus::MsgReplaying(this, "VCD", NULL, true); +#else +cStatus::MsgReplaying(this, "VCD"); + #endif + } cMenuVcdControl::~cMenuVcdControl() { Hide(); +#if VDRVERSNUM >= 10337 + cStatus::MsgReplaying(this, NULL, NULL, false); + #else cStatus::MsgReplaying(this, NULL); +#endif Stop(); } diff -Nur vcd-0.7-orig/psdcontrol.c vcd-0.7/psdcontrol.c --- vcd-0.7-orig/psdcontrol.c 2005-01-28 20:15:14.000000000 +0100 +++ vcd-0.7/psdcontrol.c 2006-06-18 18:52:15.000000000 +0200 @@ -84,8 +84,12 @@ cPsdSpiControl::~cPsdSpiControl() { - cStatus::MsgReplaying(this, NULL); -} +#if VDRVERSNUM >= 10337 + cStatus::MsgReplaying(this, NULL, NULL, false); +#else + cStatus::MsgReplaying(this, NULL); +#endif + } void cPsdSpiControl::SetItem(int Spi, cVcd *Vcd, union psd_vcd *PsdVcd) { @@ -248,12 +252,21 @@ cPsdVcdControl::cPsdVcdControl(int Lba, int Loop, int AutoWait) : cVcdPlayerControl(track, vcd, Lba, Loop, AutoWait) { +#if VDRVERSNUM >= 10337 + cStatus::MsgReplaying(this, NULL, NULL, false); +#else +cStatus::MsgReplaying(this, NULL); + #endif } cPsdVcdControl::~cPsdVcdControl() { - cStatus::MsgReplaying(this, NULL); -} +#if VDRVERSNUM >= 10337 + cStatus::MsgReplaying(this, NULL, NULL, false); + #else + cStatus::MsgReplaying(this, NULL); + #endif + } void cPsdVcdControl::SetTrack(int Track, cVcd *Vcd, union psd_vcd *PsdVcd) {