From patchwork Sun Jan 31 18:57:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: oleg roitburd X-Patchwork-Id: 12782 Received: from mail.tu-berlin.de ([130.149.7.33]) by mail.linuxtv.org with esmtp (Exim 4.69) (envelope-from ) id 1Nbeze-0002bB-No for vdr@linuxtv.org; Sun, 31 Jan 2010 19:57:59 +0100 X-tubIT-Incoming-IP: 209.85.218.227 Received: from mail-bw0-f227.google.com ([209.85.218.227]) by mail.tu-berlin.de (exim-4.69/mailfrontend-a) with esmtp for id 1Nbeze-0002Aq-9t; Sun, 31 Jan 2010 19:57:58 +0100 Received: by bwz27 with SMTP id 27so2542113bwz.1 for ; Sun, 31 Jan 2010 10:57:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:content-type :content-transfer-encoding; bh=+DrOgT/EuX55h4SHr1oBIIwr0n+hx/KLiStfc1o3b94=; b=a8M2hUUxtRZcCWmIznNEbtwZZbvOZPXEUxAa0esYGXTijS6Qdl/RsHYjXKXgiR5nLv cMuXZNNbUuJoHmJAVYfxBQcu3JOZ/EILvN//Ic9TTdf1BFPy/L5rjoQnSH/GBTlceeDH XTQ6u/ULZT5PKXT2XMv+qnP8fm1y7Qkx/fbK4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type:content-transfer-encoding; b=TIbF3xHJIbNVP3OPNekSTf90EkHULPCleIDyXQzkXTl4pHbvRqh/lfLwLDmcNFuDr5 CzVthz0x5CPopXRtHlf/HNyitGkdvbcW93Jm30GgmkmCZhH3RrAZ+okZZe/EUSjntKvu zyb7/0uC04tv3a8fwmiTU4XIeRv3EQHMbJ1M8= MIME-Version: 1.0 Received: by 10.204.10.7 with SMTP id n7mr2436171bkn.91.1264964277710; Sun, 31 Jan 2010 10:57:57 -0800 (PST) In-Reply-To: References: <20100131211615.34674b07@bk.ru> Date: Sun, 31 Jan 2010 19:57:57 +0100 Message-ID: From: Oleg Roitburd To: VDR Mailing List X-tubIT-Score: 0.0 () X-PMX-Version: 5.5.4.371499, Antispam-Engine: 2.7.1.369594, Antispam-Data: 2010.1.31.184823 X-PMX-Spam: Gauge=XII, Probability=12%, Report=' RU_TLD 0.5, MIME_CHARSET_FARAWAY 0.409, RUS_NO_X_MAILER 0.1, SUPERLONG_LINE 0.05, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, LOCALE_CYRILLIC 0, MAILTO_TO_RU_TLD 0, WEBMAIL_SOURCE 0, __BOUNCE_CHALLENGE_SUBJ 0, __BOUNCE_NDR_SUBJ_EXEMPT 0, __CHARSET_IS_KOI8R 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_MSGID 0, __HIGHBITS 0, __LOCALE_CYRILLIC_KOI8R 0, __MIME_CHARSET_FARAWAY 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __PHISH_SPEAR_STRUCTURE_1 0, __RDNS_GMAIL 0, __SANE_MSGID 0, __TO_MALFORMED_2 0' X-LSpam-Score: -3.1 (---) X-LSpam-Report: No, score=-3.1 required=5.0 tests=AWL=0.535, BAYES_00=-2.599, RCVD_IN_DNSWL_LOW=-1 autolearn=ham Subject: Re: [vdr] can't compile femon 1.7.5 with vdr 1.7.12 X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.11 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, 31 Jan 2010 18:57:59 -0000 Status: O X-Status: X-Keywords: X-UID: 22217 31 ?????? 2010 ?. 19:47 ???????????? Oleg Roitburd ???????: > 2010/1/31 Goga777 : >> /usr/src/vdr/PLUGINS/src/femon# make all >> g++ -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses -Wall -march=athlon-xp -pipe -fomit-frame-pointer -fPIC -c -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"femon"' -I../s2-liplianin/linux/include -I../../../include femonosd.c >> femonosd.c: In member function 'bool cFemonOsd::DeviceSwitch(int)': >> femonosd.c:724: error: no matching function for call to 'cTransferControl::cTransferControl(cDevice*, tChannelID, int, const int*, const int*, const int*)' >> ../../../include/vdr/transfer.h:33: note: candidates are: cTransferControl::cTransferControl(cDevice*, const cChannel*) >> ../../../include/vdr/transfer.h:28: note:                 cTransferControl::cTransferControl(const cTransferControl&) >> make: *** [femonosd.o] ?????? 1 > version 2 for Patch +#endif cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), channel->Number()); return (true); } Regards Oleg Roitburd diff -Nurp femon-1.7.5/femonosd.c femon-1.7.5-patched/femonosd.c --- femon-1.7.5/femonosd.c 2009-10-01 03:20:00.000000000 +0200 +++ femon-1.7.5-patched/femonosd.c 2010-01-31 19:54:41.000000000 +0100 @@ -721,7 +721,11 @@ bool cFemonOsd::DeviceSwitch(int directi cDevice::GetDevice(device)->SwitchChannel(channel, true); if (cDevice::GetDevice(device) == cDevice::PrimaryDevice()) cDevice::GetDevice(device)->ForceTransferMode(); +#if APIVERSNUM < 10712 cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel->GetChannelID(), channel->Vpid(), channel->Apids(), channel->Dpids(), channel->Spids())); +#else + cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel));