From 4d477cd144c8df2b3791b60f15337448292066fe Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 6 Feb 2005 18:00:00 +0100 Subject: =?UTF-8?q?Version=201.3.20=20-=20Fixed=20displaying=20the=20"Audi?= =?UTF-8?q?o"=20menu=20with=20the=20"Green"=20button=20from=20the=20"Main"?= =?UTF-8?q?=20menu=20=20=20in=20case=20there=20is=20only=20one=20audio=20t?= =?UTF-8?q?rack=20(thanks=20to=20Sascha=20Volkenandt=20for=20reporting=20?= =?UTF-8?q?=20=20this=20one).=20-=20Now=20setting=20primaryDevice=20=3D=20?= =?UTF-8?q?NULL=20before=20deleting=20the=20devices=20in=20cDevice::Shutdo?= =?UTF-8?q?wn()=20=20=20to=20avoid=20problems=20in=20case=20other=20thread?= =?UTF-8?q?s=20access=20it=20(thanks=20to=20Wolfgang=20Rohdewald=20for=20?= =?UTF-8?q?=20=20pointing=20this=20out).=20-=20Fixed=20a=20buffer=20overfl?= =?UTF-8?q?ow=20in=20case=20a=20station=20defines=20all=2032=20audio=20PID?= =?UTF-8?q?s=20(thanks=20to=20=20=20Christian=20Jacobsen=20for=20reporting?= =?UTF-8?q?=20this=20one).=20-=20Fixed=20masking=20SubStreamType=20in=20cD?= =?UTF-8?q?evice::PlayPesPacket()=20(thanks=20to=20Werner=20Fink=20=20=20f?= =?UTF-8?q?or=20pointing=20out=20this=20one).=20-=20The=20new=20function?= =?UTF-8?q?=20cPlugin::Stop()=20shall=20be=20used=20to=20stop=20any=20back?= =?UTF-8?q?ground=20activities=20=20=20of=20a=20plugin.=20Previously=20thi?= =?UTF-8?q?s=20was=20done=20in=20the=20plugin's=20destructor,=20but=20it?= =?UTF-8?q?=20is=20=20=20better=20to=20do=20this=20in=20a=20dedicated=20fu?= =?UTF-8?q?nction=20that=20can=20be=20called=20early=20when=20shutting=20?= =?UTF-8?q?=20=20down.=20-=20Moved=20the=20call=20to=20SetAudioChannel(0)?= =?UTF-8?q?=20into=20cDevice::ClrAvailableTracks()=20to=20have=20it=20=20?= =?UTF-8?q?=20executed=20also=20when=20starting=20a=20replay.=20-=20Comple?= =?UTF-8?q?ted=20the=20Danish=20OSD=20texts=20(thanks=20to=20Mogens=20Elne?= =?UTF-8?q?ff).=20-=20Completed=20the=20French=20OSD=20texts=20(thanks=20t?= =?UTF-8?q?o=20Olivier=20Jacques).=20-=20The=20new=20setup=20option=20"OSD?= =?UTF-8?q?/Channel=20info=20time"=20can=20be=20used=20to=20define=20the?= =?UTF-8?q?=20time=20after=20=20=20which=20the=20channel=20display=20is=20?= =?UTF-8?q?removed=20if=20no=20key=20has=20been=20pressed=20(thanks=20to?= =?UTF-8?q?=20=20=20Olivier=20Jacques).=20-=20Modified=20cDolbyRepacker=20?= =?UTF-8?q?to=20make=20sure=20PES=20packets=20don't=20exceed=20the=20reque?= =?UTF-8?q?sted=20length=20=20=20(thanks=20to=20Reinhard=20Nissl).=20-=20F?= =?UTF-8?q?ixed=20several=20memory=20leaks=20that=20were=20introduced=20th?= =?UTF-8?q?rough=20the=20use=20of=20cString=20(thanks=20=20=20to=20Stefan?= =?UTF-8?q?=20Huelswitt=20for=20reporting=20these).=20-=20Added=20CMD=5FSP?= =?UTF-8?q?U=5FCHG=5FCOLCON=20to=20cDvbSpuDecoder::setTime()=20(thanks=20t?= =?UTF-8?q?o=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20Making=20sure=20the=20c?= =?UTF-8?q?urrent=20audio=20track=20is=20actually=20one=20of=20the=20ones?= =?UTF-8?q?=20available=20in=20a=20=20=20recording=20(thanks=20to=20Sascha?= =?UTF-8?q?=20Volkenandt=20for=20reporting=20a=20problem=20when=20starting?= =?UTF-8?q?=20=20=20replay=20of=20a=20recording=20that=20has=20no=20Dolby?= =?UTF-8?q?=20Digital=20audio=20after=20switching=20to=20a=20channel=20=20?= =?UTF-8?q?=20that=20has=20DD=20and=20selecting=20the=20DD=20audio=20track?= =?UTF-8?q?).=20-=20Removed=20'flags'=20from=20tTrackId=20(thought=20we=20?= =?UTF-8?q?would=20need=20this,=20but=20apparently=20we=20don't).=20-=20Ma?= =?UTF-8?q?king=20sure=20the=20"Mute"=20and=20"Volume+/-"=20keys=20don't?= =?UTF-8?q?=20interfere=20with=20digital=20audio.=20-=20Fixed=20the=20"pre?= =?UTF-8?q?=201.3.19"=20compatibility=20mode=20for=20old=20Dolby=20Digital?= =?UTF-8?q?=20recordings=20(thanks=20=20=20to=20Werner=20Fink=20for=20poin?= =?UTF-8?q?ting=20out=20that=20this=20can=20be=20triggered=20in=20the=20de?= =?UTF-8?q?fault=20branch).=20-=20Calling=20pesAssembler->Reset()=20in=20c?= =?UTF-8?q?Device::AttachPlayer()=20to=20avoid=20problems=20with=20=20=20r?= =?UTF-8?q?esidual=20data=20in=20replay=20and=20Transfer=20Mode=20(thanks?= =?UTF-8?q?=20to=20Werner=20Fink=20for=20pointing=20this=20=20=20out).=20-?= =?UTF-8?q?=20Added=20MPEG1=20replay=20capability=20to=20cPesAssembler=20(?= =?UTF-8?q?thanks=20to=20Stefan=20Huelswitt).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tools.c') diff --git a/tools.c b/tools.c index 2f130c7..0501d76 100644 --- a/tools.c +++ b/tools.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: tools.c 1.88 2005/01/16 11:47:44 kls Exp $ + * $Id: tools.c 1.89 2005/02/05 10:10:30 kls Exp $ */ #include "tools.h" @@ -199,7 +199,7 @@ cString strescape(const char *s, const char *chars) } if (t) *t = 0; - return s; + return cString(s, t != NULL); } bool startswith(const char *s, const char *p) @@ -250,7 +250,7 @@ cString AddDirectory(const char *DirName, const char *FileName) { char *buf; asprintf(&buf, "%s/%s", DirName && *DirName ? DirName : ".", FileName); - return buf; + return cString(buf, true); } cString itoa(int n) @@ -513,9 +513,9 @@ uint64 cTimeMs::Elapsed(void) // --- cString --------------------------------------------------------------- -cString::cString(const char *S) +cString::cString(const char *S, bool TakePointer) { - s = S ? strdup(S) : NULL; + s = TakePointer ? (char *)S : S ? strdup(S) : NULL; } cString::~cString() -- cgit v1.2.3