From patchwork Wed Feb 4 14:18:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ales Jurik X-Patchwork-Id: 12702 Received: from smtp-out2.iol.cz ([194.228.2.87]) by www.linuxtv.org with esmtp (Exim 4.63) (envelope-from ) id 1LUib0-0000kI-26 for vdr@linuxtv.org; Wed, 04 Feb 2009 15:19:19 +0100 Received: from ales-debian.local (unknown [88.103.120.47]) by smtp-out2.iol.cz (Postfix) with ESMTP id BE13A93CB3; Wed, 4 Feb 2009 15:18:39 +0100 (CET) From: Ales Jurik To: vdr@linuxtv.org Date: Wed, 4 Feb 2009 15:18:39 +0100 User-Agent: KMail/1.9.9 References: <49608.130.36.62.141.1233740343.squirrel@webmail.xs4all.nl> <498974D3.5030505@cadsoft.de> In-Reply-To: MIME-Version: 1.0 Message-Id: <200902041518.39678.ajurik@quick.cz> X-LSpam-Score: -0.9 (/) X-LSpam-Report: No, score=-0.9 required=5.0 tests=AWL=-1.483, BAYES_00=-2.599, PERCENT_RANDOM=3.196 autolearn=no Subject: Re: [vdr] VDR 1.7.0 & S2API - Channels not Available X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.9 Precedence: list Reply-To: ajurik@quick.cz, VDR Mailing List List-Id: VDR Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2009 14:19:19 -0000 Status: O X-Status: X-Keywords: X-UID: 19476 On Wednesday 04 of February 2009, Morfsta wrote: > On Wed, Feb 4, 2009 at 10:58 AM, Klaus Schmidinger > > wrote: > > Well, even using *any* version 1.7.x in a productive environment > > is a risk ;-) > > [SNIP] > > > S2API was necessary for HDTV channels, and recording HDTV channels > > only makes sense in TS. The PES recording of HDTV broadcasts was never > > officially supported by VDR. > > The other problem is that I don't think anyone has got VDR 1.7.4 > working with the eHD yet, which is my output device... :-( So it seems > everywhere I look at the moment I am stuck. :-( > Here are patches for eHD and vdr-1.7.4. I've tested it only for a little time as I didn't have enough time (now I revert back to vdr-1.7.0 with multiproto). Included are two patches - first is for reelbox plugin. In file ReelBoxDevice.c patch solves the audio problem (vdr is sending audio with zero trackid and reelbox plugin cancel such streams). In setupmenu.c is solved the problem with saving config and in VideoPlayerPipHd.c the include solves for me compile problem in amd64 linux. In the patch for vdr in part of device.c is patch from Klaus for subtitles and rest is very quick and dirty patch for osd to compile with reelbox plugin. It mostly revert the vdr osd to 1.7.0 version of files, but it seems to be working at minimum with default STTNG skin, other skins are not tested. Enjoy, BR, Ales diff -ru reelbox-3.10388.orig/ReelBoxDevice.c reelbox-3.10388/ReelBoxDevice.c --- reelbox-3.10388.orig/ReelBoxDevice.c 2009-01-19 13:22:30.000000000 +0100 +++ reelbox-3.10388/ReelBoxDevice.c 2009-02-01 21:17:12.647764560 +0100 @@ -568,10 +568,10 @@ CHECK_CONCURRENCY; const tTrackId *trackId = GetTrack(GetCurrentAudioTrack()); - if (!trackId || trackId->id != id) - { - return length; - } +// if (!trackId || trackId->id != id) +// { +// return length; +// } diff -ru reelbox-3.10388.orig/setupmenu.c reelbox-3.10388/setupmenu.c --- reelbox-3.10388.orig/setupmenu.c 2009-01-19 13:22:30.000000000 +0100 +++ reelbox-3.10388/setupmenu.c 2009-01-19 17:10:08.000000000 +0100 @@ -27,6 +27,7 @@ if (state == osUnknown && key == kOk) { + if (HasSubMenu()) return cMenuSetupPage::ProcessKey(key); const char *text = Get(Current())->Text(); if ( text && strstr(text, tr("Video Settings")) ) diff -ru reelbox-3.10388.orig/VideoPlayerPipHd.c reelbox-3.10388/VideoPlayerPipHd.c --- reelbox-3.10388.orig/VideoPlayerPipHd.c 2009-01-19 13:22:30.000000000 +0100 +++ reelbox-3.10388/VideoPlayerPipHd.c 2009-01-19 17:03:12.000000000 +0100 @@ -39,6 +39,8 @@ // I like standards... typedef unsigned char uchar; +#include + #define PICS_BUF 16 #define HDFB_DEVICE "/dev/fb0" #define ES_BUFFER_SIZE (262144)