From patchwork Fri Mar 15 15:59:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Riechardt X-Patchwork-Id: 17387 Received: from localhost ([127.0.0.1] helo=www.linuxtv.org) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1UGX34-0003tf-Rh; Fri, 15 Mar 2013 17:00:02 +0100 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1UGX2e-0003tN-H9 for vdr@linuxtv.org; Fri, 15 Mar 2013 17:00:00 +0100 X-tubIT-Incoming-IP: 212.227.15.18 Received: from mout.gmx.net ([212.227.15.18]) by mail.tu-berlin.de (exim-4.75/mailfrontend-4) with esmtp for id 1UGX2e-0004tD-AL; Fri, 15 Mar 2013 16:59:36 +0100 Received: from mailout-de.gmx.net ([10.1.76.28]) by mrigmx.server.lan (mrigmx002) with ESMTP (Nemesis) id 0Lr5Xp-1UtSdA2smh-00ebUr for ; Fri, 15 Mar 2013 16:59:35 +0100 Received: (qmail invoked by alias); 15 Mar 2013 15:59:35 -0000 Received: from p54AF40B4.dip0.t-ipconnect.de (EHLO [192.168.178.3]) [84.175.64.180] by mail.gmx.net (mp028) with SMTP; 15 Mar 2013 16:59:35 +0100 X-Authenticated: #1662389 X-Provags-ID: V01U2FsdGVkX1/WhUVXst3W5cWainku/8cOyRLB5VzZCN11NI1CIH xXgab50jPFJG9z Message-ID: <51434563.8080008@gmx.de> Date: Fri, 15 Mar 2013 16:59:31 +0100 From: Joerg Riechardt User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130307 Thunderbird/17.0.4 MIME-Version: 1.0 To: vdr@linuxtv.org References: <4D810F94.2040201@gmx.de> <51434066.1080708@web.de> In-Reply-To: <51434066.1080708@web.de> X-Y-GMX-Trusted: 0 X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2013.3.15.154818 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, MIME_TEXT_ONLY_MP_MIXED 0.05, MSGID_ADDED_BY_MTA 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_3000_3999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, __ANY_URI 0, __BAT_BOUNDARY 0, __BOUNCE_CHALLENGE_SUBJ 0, __BOUNCE_NDR_SUBJ_EXEMPT 0, __CP_URI_IN_BODY 0, __CT 0, __CTYPE_HAS_BOUNDARY 0, __CTYPE_MULTIPART 0, __CTYPE_MULTIPART_MIXED 0, __FORWARDED_MSG 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FW_1LN_BOT_MSGID 0, __HAS_FROM 0, __HAS_MSGID 0, __IN_REP_TO 0, __LINES_OF_YELLING 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MOZILLA_MSGID 0, __MOZILLA_USER_AGENT 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NS , __USER_AGENT 0' X-LSpam-Score: -1.1 (-) X-LSpam-Report: No, score=-1.1 required=5.0 tests=BAYES_00=-1.9, FREEMAIL_FROM=0.001, RDNS_NONE=0.793 autolearn=no Subject: Re: [vdr] [ANNOUNCE] vdr-xine-0.9.4 plugin X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: VDR Mailing List List-Id: VDR Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: vdr-bounces@linuxtv.org Errors-To: vdr-bounces@linuxtv.org Hi, two patches I use attached, Joerg Am 15.03.2013 16:38, schrieb Carsten Koch: > Hi, > > On 03/16/11 20:29, Reinhard Nissl wrote: >> I'm pleased to announce maintenance release 0.9.4. > is there something newer available? > In partcular, something that works with VDR 1.7.40? > > With VDR 1.7.40 (under OpenSUSE 12.3) I get: > > > *** Plugin xine: > WARNING: plugin xine is using an old Makefile! > g++ -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses -fPIC > -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE > -D_LARGEFILE64_SOURCE -c -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"xine"' > -DFIFO_DIR=\"/tmp/vdr-xine\" -DVERIFY_BITMAP_DIRTY=0 `pkg-config > --cflags libxine` -I/home/cko/vdr-1.7.40/include xineDevice.c > xineDevice.c: In member function 'virtual void > PluginXine::cXineDevice::StillPicture(const uchar*, int)': > xineDevice.c:1203:36: error: 'class cPatPmtParser' has no member named > 'PmtPid' > xineDevice.c:1403:1: warning: narrowing conversion of > '(vdr172::cRemux::IsFrameH264(Data, Length) ? 10 : 183)' from 'int' to > 'uchar {aka unsigned char}' inside { } is ill-formed in C++11 [-Wnarrowing] > make[1]: *** [xineDevice.o] Error 1 > > >> You can >> find it on my homepage as usual: >> >> http://home.vr-web.de/~rnissl > > Not any more. > http://home.vr-web.de in general and http://home.vr-web.de/~rnissl > seems to be gone. > > Cheers, > Carsten. > > > _______________________________________________ > vdr mailing list > vdr@linuxtv.org > http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr > diff -Nru b/Makefile a/Makefile --- b/Makefile 2011-03-15 23:22:03.000000000 +0100 +++ a/Makefile 2012-03-27 23:28:00.684231800 +0200 @@ -97,7 +97,7 @@ ### The main target: -all: libvdr-$(PLUGIN).so i18n xineplayer +all: libvdr-$(PLUGIN).so xineplayer ### Implicit rules: diff -Nru b/xine.c a/xine.c --- b/xine.c 2011-01-18 14:45:04.000000000 +0100 +++ a/xine.c 2012-03-27 23:29:28.338233019 +0200 @@ -13,7 +13,6 @@ #include "xineDevice.h" #include "xineSettings.h" #include "xineSetupPage.h" -#include "xineI18n.h" diff -Naur xine-0.9.4_orig/xineDevice.c xine-0.9.4/xineDevice.c --- xine-0.9.4_orig/xineDevice.c 2011-02-27 19:14:19.000000000 +0100 +++ xine-0.9.4/xineDevice.c 2012-12-22 18:42:36.389557075 +0100 @@ -1200,7 +1200,11 @@ int pid = TsPid(Data); if (pid == 0) patPmtParser.ParsePat(Data, TS_SIZE); +#if APIVERSNUM >= 10732 + else if (patPmtParser.IsPmtPid(pid)) +#else else if (pid == patPmtParser.PmtPid()) +#endif patPmtParser.ParsePmt(Data, TS_SIZE); else if (pid == patPmtParser.Vpid()) {