From patchwork Wed Apr 14 07:24:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Schmirler X-Patchwork-Id: 12806 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.69) (envelope-from ) id 1O1wxu-0005zZ-TP for vdr@linuxtv.org; Wed, 14 Apr 2010 09:25:00 +0200 X-tubIT-Incoming-IP: 213.179.141.2 Received: from mail.linogate.de ([213.179.141.2]) by mail.tu-berlin.de (exim-4.69/mailfrontend-c) with esmtps [TLSv1:AES256-SHA:256] for id 1O1wxu-0000yd-3y; Wed, 14 Apr 2010 09:24:50 +0200 Received: from andreas-mair.de (localhost [127.0.0.1]) by mail.linogate.de with ESMTP id o3E7OlwY007487 for ; Wed, 14 Apr 2010 09:24:47 +0200 From: "Frank Schmirler" To: VDR Mailing List Date: Wed, 14 Apr 2010 09:24:47 +0200 Message-Id: <20100414065329.M77755@linogate.de> In-Reply-To: References: <20100412082223.M72302@linogate.de><860CB006634E4904B282815D74289145@telstraclear.tclad><20100412125901.M94851@linogate.de><236A830A6EA54825A09DDB81FD7B03FA@telstraclear.tclad><20100413074608.M11644@linogate.de> <20100413112559.M57459@linogate.de> X-Mailer: OpenWebMail 2.53 20070812 X-OriginatingIP: 213.179.141.1 (schmirl) MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0 (mail.linogate.de [127.0.0.1]); Wed, 14 Apr 2010 09:24:47 +0200 (CEST) X-tubIT-Score: 0.0 () X-PMX-Version: 5.5.4.371499, Antispam-Engine: 2.7.1.369594, Antispam-Data: 2010.4.14.70920 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MIME_TEXT_ONLY_MP_MIXED 0.05, BODY_SIZE_3000_3999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, WEBMAIL_SOURCE 0, WEBMAIL_XMAILER 0, WEBMAIL_XOIP2 0, WEBMAIL_X_IP_HDR 0, __BOUNCE_CHALLENGE_SUBJ 0, __BOUNCE_NDR_SUBJ_EXEMPT 0, __CT 0, __CTYPE_HAS_BOUNDARY 0, __CTYPE_MULTIPART 0, __CTYPE_MULTIPART_MIXED 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __PHISH_SPEAR_STRUCTURE_1 0, __PHISH_SPEAR_STRUCTURE_2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0' X-LSpam-Score: -3.2 (---) X-LSpam-Report: No, score=-3.2 required=5.0 tests=AWL=0.423, BAYES_00=-2.599, RCVD_IN_DNSWL_LOW=-1 autolearn=ham Subject: Re: [vdr] TS Play Plugin - breaks streamdev and radio plugins 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: Wed, 14 Apr 2010 07:25:00 -0000 Status: O X-Status: X-Keywords: X-UID: 22822 On Wed, 14 Apr 2010 07:37:37 +1200, Simon Baxter wrote > Sorry Frank - definitely patched. I just tried cleaning and > recompiling everything, don't seem to be getting the IsPesRecording > function error, but am still getting the cIndexFile mismatch: > > server/recplayer.c: In member function 'uint64_t > cRecPlayer::positionFromFrameNumber(uint32_t)': > server/recplayer.c:253: error: no matching function for call to > 'cIndexFile::Get(int, uchar*, int*)' > ../../../include/vdr/recording.h:229: note: candidates are: bool > cIndexFile::Get(int, uint16_t*, off_t*, uchar*, int*) > ../../../include/vdr/recording.h:231: note: int > cIndexFile::Get(uint16_t, off_t) > make: *** [server/recplayer.o] Error 1 > > I don't get it - it's calling a Get(int, uchar*, int*), which are > defined Get(int, uint16_t*, off_t*, uchar*, int*) ?? Great - almost there. Before your cleanup, the compiler complained about no matching function for call to 'cIndexFile::Get(int, uint16_t*, off_t*)' now it's no matching function for call to 'cIndexFile::Get(int, uchar*, int*)' So this time the "#if VDRVERSNUM >= 10703" in streamdev's server/recplayer.c wasn't changed or not changed correctly. It should read "#if 1". I attached a patch for streamdev, making it automatically detect the tsplay patch. Can you give it a try? Apparently you are using a patched streamdev. According to one of your previous mails there's one '#if' more. Please modify this additional '#if' as in the patch. Regards, Frank Index: server/recplayer.c =================================================================== RCS file: /var/cvsroot/streamdev/server/recplayer.c,v retrieving revision 1.1 diff -u -r1.1 recplayer.c --- server/recplayer.c 1 Jul 2009 11:00:49 -0000 1.1 +++ server/recplayer.c 14 Apr 2010 06:31:09 -0000 @@ -34,7 +34,7 @@ // FIXME find out max file path / name lengths -#if VDRVERSNUM >= 10703 +#if VDRVERSNUM >= 10703 || defined(MAXVIDEOFILESIZETS) indexFile = new cIndexFile(recording->FileName(), false, rec->IsPesRecording()); #else indexFile = new cIndexFile(recording->FileName(), false); @@ -58,7 +58,7 @@ for(i = 1; i < 1000; i++) { -#if APIVERSNUM < 10703 +#if APIVERSNUM < 10703 || !defined(MAXVIDEOFILESIZETS) snprintf(fileName, 2047, "%s/%03i.vdr", recording->FileName(), i); //log->log("RecPlayer", Log::DEBUG, "FILENAME: %s", fileName); file = fopen(fileName, "r"); @@ -99,7 +99,7 @@ char fileName[2048]; -#if APIVERSNUM >= 10703 +#if APIVERSNUM >= 10703 || defined(MAXVIDEOFILESIZETS) snprintf(fileName, 2047, "%s/%05i.ts", recording->FileName(), index); isyslog("openFile called for index %i string:%s", index, fileName); @@ -222,7 +222,7 @@ { if (!indexFile) return 0; -#if VDRVERSNUM >= 10703 +#if VDRVERSNUM >= 10703 || defined(MAXVIDEOFILESIZETS) uint16_t retFileNumber; off_t retFileOffset; #else