From patchwork Fri Feb 14 08:54:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pertti Kosunen X-Patchwork-Id: 22307 Received: from localhost ([127.0.0.1] helo=www.linuxtv.org) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1WEEXu-0001Zv-OC; Fri, 14 Feb 2014 09:54:54 +0100 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1WEEXt-0001Zo-2h for vdr@linuxtv.org; Fri, 14 Feb 2014 09:54:53 +0100 X-tubIT-Incoming-IP: 213.243.153.189 Received: from filtteri6.pp.htv.fi ([213.243.153.189]) by mail.tu-berlin.de (exim-4.72/mailfrontend-6) with esmtp for id 1WEEXr-0007mx-5Q; Fri, 14 Feb 2014 09:54:52 +0100 Received: from localhost (localhost [127.0.0.1]) by filtteri6.pp.htv.fi (Postfix) with ESMTP id B83D256FB1A for ; Fri, 14 Feb 2014 10:54:50 +0200 (EET) X-Virus-Scanned: Debian amavisd-new at pp.htv.fi Received: from smtp5.welho.com ([213.243.153.39]) by localhost (filtteri6.pp.htv.fi [213.243.153.189]) (amavisd-new, port 10024) with ESMTP id Mw94H7geOa07 for ; Fri, 14 Feb 2014 10:54:45 +0200 (EET) Received: from [10.0.0.6] (cs170214.pp.htv.fi [213.243.170.214]) by smtp5.welho.com (Postfix) with ESMTP id CEE095BC006 for ; Fri, 14 Feb 2014 10:54:45 +0200 (EET) Message-ID: <52FDD9B6.5070508@pp.nic.fi> Date: Fri, 14 Feb 2014 10:54:14 +0200 From: Pertti Kosunen User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:30.0) Gecko/20100101 Thunderbird/30.0a1 MIME-Version: 1.0 To: VDR Mailing List References: <87ha82lmpg.fsf@micropit.couberia.selfip.net> In-Reply-To: <87ha82lmpg.fsf@micropit.couberia.selfip.net> X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.2.14.84515 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, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, NO_URI_FOUND 0, __BAT_BOUNDARY 0, __BOUNCE_CHALLENGE_SUBJ 0, __BOUNCE_NDR_SUBJ_EXEMPT 0, __CT 0, __CTYPE_HAS_BOUNDARY 0, __CTYPE_MULTIPART 0, __CTYPE_MULTIPART_MIXED 0, __HAS_FROM 0, __HAS_MSGID 0, __INT_PROD_MP3 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MOZILLA_MSGID 0, __MOZILLA_USER_AGENT 0, __SANE_MSGID 0, __SUBJ_ALPHA_NEGATE 0, __SXL_SIG_ERROR_SERVFAIL , __SXL_URI_ERROR_SERVFAIL , __TO_MALFORMED_2 0, __USER_AGENT 0' X-LSpam-Score: -1.1 (-) X-LSpam-Report: No, score=-1.1 required=5.0 tests=BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793 autolearn=no Subject: Re: [vdr] mp3 plugin for vdr-2.1.4 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 On 13.2.2014 23:36, Peter Münster wrote: > Could anybody help please to make the plugin work with the latest vdr > version? Try attached patch. diff -ru mp3-original/decoder.c mp3/decoder.c --- mp3-original/decoder.c 2014-02-14 10:36:30.782671000 +0200 +++ mp3/decoder.c 2014-02-14 10:18:32.749324540 +0200 @@ -632,7 +632,11 @@ char *cInfoCache::CacheFile(void) { +#if APIVERSNUM > 20101 + return AddPath(cachedir?cachedir:cVideoDirectory::Name(),CACHEFILENAME); +#else return AddPath(cachedir?cachedir:VideoDirectory,CACHEFILENAME); +#endif } void cInfoCache::Save(bool force) diff -ru mp3-original/player-mplayer.c mp3/player-mplayer.c --- mp3-original/player-mplayer.c 2014-02-14 10:36:30.782671000 +0200 +++ mp3/player-mplayer.c 2014-02-14 10:26:33.827716456 +0200 @@ -185,7 +185,11 @@ if(MPlayerSetup.ResumeMode==1 || (access(s,W_OK) && (errno==EACCES || errno==EROFS))) { global=true; +#if APIVERSNUM > 20101 + resfile=AddPath(globalResumeDir?globalResumeDir:cVideoDirectory::Name(),GLOBAL_RESUME_FILE); +#else resfile=AddPath(globalResumeDir?globalResumeDir:VideoDirectory,GLOBAL_RESUME_FILE); +#endif d(printf("resume: using global file\n")) } else {