From 05402c740765e6e0ca2aaf1760c77d9e3d3ed5a5 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 27 Feb 2005 18:00:00 +0100 Subject: =?UTF-8?q?Version=201.3.22=20-=20Removed=20some=20unneeded=20code?= =?UTF-8?q?=20and=20fixed=20access=20to=20unallocated=20memory=20in=20=20?= =?UTF-8?q?=20cEvent::FixEpgBugs()=20(thanks=20to=20Wolfgang=20Rohdewald).?= =?UTF-8?q?=20-=20Avoiding=20unnecessary=20calls=20to=20SetPid()=20in=20cD?= =?UTF-8?q?vbDevice::SetAudioTrackDevice()=20=20=20(thanks=20to=20Marco=20?= =?UTF-8?q?Schl=C3=BC=C3=9Fler).=20-=20No=20longer=20calling=20EnsureAudio?= =?UTF-8?q?Track()=20in=20cDevice::SetChannel()=20if=20a=20Transfer=20Mode?= =?UTF-8?q?=20is=20=20=20started,=20to=20avoid=20setting=20the=20audio=20P?= =?UTF-8?q?ID=20on=20the=20primary=20device=20(thanks=20to=20Marco=20=20?= =?UTF-8?q?=20Schl=C3=BC=C3=9Fler=20for=20pointing=20this=20out).=20-=20Re?= =?UTF-8?q?placed=20the=20call=20to=20system("sync")=20in=20SpinUpDisk()?= =?UTF-8?q?=20with=20fdatasync(f)=20to=20avoid=20=20=20problems=20on=20NPT?= =?UTF-8?q?L=20systems=20(thanks=20to=20Chris=20Warren=20for=20pointing=20?= =?UTF-8?q?this=20out).=20-=20Increased=20POLLTIMEOUTS=5FBEFORE=5FDEVICECL?= =?UTF-8?q?EAR=20in=20transfer.c=20to=206=20to=20avoid=20problems=20=20=20?= =?UTF-8?q?with=20the=20larger=20buffer=20reserve=20(thanks=20to=20Marco?= =?UTF-8?q?=20Schl=C3=BC=C3=9Fler).=20-=20Fixed=20the=20call=20to=20SetVid?= =?UTF-8?q?eoFormat()=20in=20cDvbDevice::cDvbDevice()=20(parameter=20is=20?= =?UTF-8?q?=5Fbool=5F).=20-=20Added=20support=20for=20setting=20the=20vide?= =?UTF-8?q?o=20display=20mode=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler?= =?UTF-8?q?).=20-=20The=20new=20setup=20option=20"DVB/Video=20display=20fo?= =?UTF-8?q?rmat"=20can=20be=20used=20to=20define=20which=20display=20=20?= =?UTF-8?q?=20format=20to=20use=20for=20playing=20wide=20screen=20video=20?= =?UTF-8?q?on=20a=204:3=20tv=20set.=20-=20Changed=20MAXDPIDS=20to=2016=20(?= =?UTF-8?q?8xAC3=20+=208xDTS)=20(thanks=20to=20Werner=20Fink=20for=20point?= =?UTF-8?q?ing=20this=20out).=20-=20Completed=20Dutch=20language=20texts?= =?UTF-8?q?=20(thanks=20to=20Hans=20Dingemans).=20-=20Added=20'smi'=20to?= =?UTF-8?q?=20the=20Finnish=20language=20codes=20(thanks=20to=20Rolf=20Ahr?= =?UTF-8?q?enberg).=20-=20Fixed=20ensuring=20there=20is=20a=20current=20au?= =?UTF-8?q?dio=20track=20in=20case=20there=20is=20only=20one=20track=20=20?= =?UTF-8?q?=20(thanks=20to=20Werner=20Fink=20for=20reporting=20this=20one)?= =?UTF-8?q?.=20-=20Improved=20automatic=20audio=20track=20selection.=20-?= =?UTF-8?q?=20Keeping=20the=20track=20language=20codes=20and=20description?= =?UTF-8?q?s=20in=20Transfer=20Mode=20(thanks=20to=20=20=20Luca=20Olivetti?= =?UTF-8?q?).=20-=20Fixed=20handling=20repeated=20kAudio=20keys.=20-=20Imp?= =?UTF-8?q?roved=20displaying=20the=20the=20current=20audio=20track=20in?= =?UTF-8?q?=20the=20ST:TNG=20channel=20display.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'epg.c') diff --git a/epg.c b/epg.c index 5539ab0..df267f6 100644 --- a/epg.c +++ b/epg.c @@ -7,7 +7,7 @@ * Original version (as used in VDR before 1.3.0) written by * Robert Schneider and Rolf Hakenes . * - * $Id: epg.c 1.24 2005/01/02 11:25:25 kls Exp $ + * $Id: epg.c 1.25 2005/02/19 11:35:00 kls Exp $ */ #include "epg.h" @@ -525,7 +525,7 @@ void cEvent::FixEpgBugs(void) if (description) { char *p = description; while (*p && *(p + 1) && *(p + 2)) { - if (*p == '-' && *(p + 1) == ' ' && *(p + 2) && islower(*(p - 1)) && islower(*(p + 2))) { + if (*p == '-' && *(p + 1) == ' ' && p != description && islower(*(p - 1)) && islower(*(p + 2))) { if (!startswith(p + 2, "und ")) { // special case in German, as in "Lach- und Sachgeschichten" memmove(p, p + 2, strlen(p + 2) + 1); EpgBugFixStat(5, ChannelID()); -- cgit v1.2.3