From fb5cccb2df60361a18fe3fd572b0fe18f3a4331c Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 9 Jan 2005 18:00:00 +0100 Subject: =?UTF-8?q?Version=201.3.18=20-=20Removed=20an=20unused=20variable?= =?UTF-8?q?=20from=20cTimer::GetWDayFromMDay()=20(thanks=20to=20Wayne=20Ke?= =?UTF-8?q?er=20=20=20for=20reporting=20this=20one).=20-=20Some=20more=20c?= =?UTF-8?q?hanges=20to=20the=20'childTid'=20handling=20in=20cThread=20(bas?= =?UTF-8?q?ed=20on=20suggestions=20by=20=20=20Stefan=20Huelswitt).=20-=20F?= =?UTF-8?q?ixed=20the=20spelling=20of=20'canceling'=20(thanks=20to=20Wayne?= =?UTF-8?q?=20Keer=20for=20reporting=20this=20one).=20-=20Re-introduced=20?= =?UTF-8?q?a=20sleep=20to=20cDvbPlayer::Action()=20to=20avoid=20high=20CPU?= =?UTF-8?q?=20load=20in=20still=20=20=20picture=20mode=20(thanks=20to=20Re?= =?UTF-8?q?inhard=20Nissl=20for=20reporting=20this=20one).=20-=20Fixed=20a?= =?UTF-8?q?=20possible=20race=20condition=20in=20generating=20the=20DVB=20?= =?UTF-8?q?device=20names=20(thanks=20to=20=20=20Rainer=20Zocholl=20for=20?= =?UTF-8?q?reporting=20this=20one).=20-=20Changed=20the=20way=20PES=20pack?= =?UTF-8?q?ets=20are=20played=20to=20allow=20replay=20of=20AC3=20sound=20o?= =?UTF-8?q?ver=20the=20=20=20full=20featured=20DVB=20cards=20(partially=20?= =?UTF-8?q?based=20on=20a=20patch=20from=20Werner=20Fink).=20=20=20+=20The?= =?UTF-8?q?=20new=20function=20cDevice::PlayPes()=20is=20now=20called=20wi?= =?UTF-8?q?th=20the=20complete=20PES=20data=20=20=20=20=20stream=20and=20c?= =?UTF-8?q?alls=20PlayVideo()=20and=20PlayAudio()=20as=20necessary.=20=20?= =?UTF-8?q?=20+=20cDevice::PlayVideo()=20is=20now=20only=20called=20with?= =?UTF-8?q?=20actual=20video=20PES=20packets.=20=20=20+=20cDevice::PlayAud?= =?UTF-8?q?io()=20is=20now=20called=20with=20the=20actual=20audio=20PES=20?= =?UTF-8?q?packets,=20which=20=20=20=20=20can=20be=20either=20"normal"=20a?= =?UTF-8?q?udio=20or=20AC3=20data.=20You=20need=20at=20least=20firmware=20?= =?UTF-8?q?version=20=20=20=20=200x261d=20to=20replay=20AC3=20sound=20over?= =?UTF-8?q?=20a=20full=20featured=20DVB=20card.=20This=20function=20now=20?= =?UTF-8?q?=20=20=20=20has=20an=20'int'=20return=20value.=20=20=20+=20Play?= =?UTF-8?q?Audio()=20of=20derived=20cDevice=20classes=20shall=20no=20longe?= =?UTF-8?q?r=20call=20the=20base=20class=20=20=20=20=20function.=20It=20sh?= =?UTF-8?q?all=20just=20play=20the=20given=20data=20as=20audio.=20=20=20+?= =?UTF-8?q?=20cPlayer::PlayVideo()=20and=20cPlayer::PlayAudio()=20are=20no?= =?UTF-8?q?w=20obsolete=20and=20have=20been=20=20=20=20=20replaced=20with?= =?UTF-8?q?=20cPlayer::PlayPes().=20=20=20+=20All=20StripAudioPackets()=20?= =?UTF-8?q?functions=20are=20now=20obsolete.=20The=20functionality=20has?= =?UTF-8?q?=20been=20=20=20=20=20moved=20into=20cDevice::PlayPes(),=20wher?= =?UTF-8?q?e=20only=20the=20video=20and=20audio=20packets=20that=20are=20?= =?UTF-8?q?=20=20=20=20actually=20required=20will=20be=20processed.=20=20?= =?UTF-8?q?=20+=20All=20audio=20track=20handling=20is=20now=20done=20by=20?= =?UTF-8?q?cDevice;=20cTransfer=20and=20cDvbPlayer=20no=20=20=20=20=20long?= =?UTF-8?q?er=20care=20about=20audio=20tracks.=20cPlayer,=20however,=20sti?= =?UTF-8?q?ll=20has=20the=20virtual=20hooks=20=20=20=20=20for=20audio=20tr?= =?UTF-8?q?ack=20handling=20in=20order=20to=20allow=20plugins=20to=20imple?= =?UTF-8?q?ment=20players=20that=20=20=20=20=20have=20their=20own=20idea?= =?UTF-8?q?=20about=20this.=20=20=20+=20cChannel::[AD]pid[12]()=20have=20b?= =?UTF-8?q?een=20replaced=20with=20cChannel::[AD]pid(int=20i)=20to=20=20?= =?UTF-8?q?=20=20=20allow=20access=20to=20all=20available=20PIDs.=20-=20Es?= =?UTF-8?q?caped=20the=20'-'=20and=20'=C3=B6'=20characters=20in=20the=20ma?= =?UTF-8?q?n=20pages=20(thanks=20to=20Darren=20Salt=20for=20=20=20pointing?= =?UTF-8?q?=20this=20out).=20-=20Completed=20the=20Italian=20OSD=20texts?= =?UTF-8?q?=20(thanks=20to=20Sean=20Carlos).=20-=20Fixed=20setting=20'sync?= =?UTF-8?q?ed'=20in=20cRemux=20when=20recording=20radio=20channels=20(than?= =?UTF-8?q?ks=20to=20=20=20Laurence=20Abbott).=20-=20Removed=20the=20LOCK?= =?UTF-8?q?=5FTHREAD=20from=20the=20LIRC=20thread=20(thanks=20to=20Ludwig?= =?UTF-8?q?=20Nussel).=20-=20Fixed=20genfontfile.c=20(sometimes=20the=20ch?= =?UTF-8?q?aracter=20width=20was=20wrong,=20and=20the=20codes=20were=20=20?= =?UTF-8?q?=20shifted=20one=20too=20far=20to=20the=20left).=20-=20Fixed=20?= =?UTF-8?q?the=20character=20width=20and=20shifted=20the=20codes=20one=20t?= =?UTF-8?q?o=20the=20right=20in=20all=20font=20=20=20files.=20-=20Renamed?= =?UTF-8?q?=20font=3F=3F=3F.c=20to=20font=3F=3F=3F-iso8859-1.c=20for=20sym?= =?UTF-8?q?metry.=20-=20Switched=20the=20character=20set=20to=20iso8859-15?= =?UTF-8?q?=20for=20English,=20German=20and=20Finnish=20(thanks=20=20=20to?= =?UTF-8?q?=20Andreas=20Brugger=20for=20reporting=20the=20missing=20Euro?= =?UTF-8?q?=20sign=20in=20iso8859-1).=20-=20Added=20'channels.conf.terr'?= =?UTF-8?q?=20entries=20for=20L=C3=BCbeck=20(thanks=20to=20Stefan=20Hu?= =?UTF-8?q?=C3=9Ffeldt).=20-=20Fixed=20a=20race=20condition=20in=20startin?= =?UTF-8?q?g=20a=20thread=20(thanks=20to=20Reinhard=20Nissl=20for=20=20=20?= =?UTF-8?q?reporting=20this=20one).=20-=20Replaced=20non-threadsafe=20libr?= =?UTF-8?q?ary=20functions=20with=20their=20threadsafe=20versions=20(thank?= =?UTF-8?q?s=20=20=20to=20Rainer=20Zocholl=20for=20pointing=20this=20out).?= =?UTF-8?q?=20-=20Other=20non-threadsafe=20functions=20have=20been=20repla?= =?UTF-8?q?ced=20by=20threadsafe=20classes=20that=20hide=20=20=20the=20act?= =?UTF-8?q?ual=20buffering.=20In=20particular=20these=20are:=20=20=20readd?= =?UTF-8?q?ir()=20->=20cReadDir=20=20=20readline()=20->=20cReadLine=20-=20?= =?UTF-8?q?Several=20formerly=20non-threadsafe=20functions=20now=20have=20?= =?UTF-8?q?a=20return=20type=20of=20cString:=20=20=20cChannel::ToText()=20?= =?UTF-8?q?=20=20tChannelID::ToString()=20=20=20cEvent::GetDateString()=20?= =?UTF-8?q?=20=20cEvent::GetTimeString()=20=20=20cEvent::GetEndTimeString(?= =?UTF-8?q?)=20=20=20cEvent::GetVpsString()=20=20=20cMark::ToText()=20=20?= =?UTF-8?q?=20cTimer::ToText()=20=20=20cSource::ToString()=20=20=20cTimer:?= =?UTF-8?q?:PrintDay()=20=20=20cTimer::PrintFirstDay()=20=20=20PrefixVideo?= =?UTF-8?q?FileName()=20=20=20IndexToHMSF()=20=20=20ChannelString()=20=20?= =?UTF-8?q?=20strescape()=20=20=20AddDirectory()=20=20=20itoa()=20=20=20We?= =?UTF-8?q?ekDayName()=20=20=20DayDateTime()=20=20=20When=20using=20these?= =?UTF-8?q?=20functions=20in=20a=20'const=20char=20*'=20context=20there=20?= =?UTF-8?q?is=20nothing=20special=20=20=20to=20consider,=20except=20that?= =?UTF-8?q?=20you=20can=20no=20longer=20have=20a=20pointer=20to=20the=20re?= =?UTF-8?q?turn=20value,=20=20=20as=20in=20=20=20const=20char=20*date=20?= =?UTF-8?q?=3D=20DayDateTime();=20=20=20Although=20this=20will=20compile?= =?UTF-8?q?=20without=20error=20message,=20the=20resulting=20'date'=20will?= =?UTF-8?q?=20not=20=20=20be=20valid=20after=20this=20line.=20Use=20this?= =?UTF-8?q?=20instead:=20=20=20cString=20date=20=3D=20DayDateTime();=20=20?= =?UTF-8?q?=20In=20a=20'const=20void=20*'=20context=20(as=20in=20printf()?= =?UTF-8?q?=20etc.)=20the=20result=20needs=20to=20be=20=20=20dereferenced?= =?UTF-8?q?=20with=20a=20'*',=20as=20in=20=20=20printf("%s",=20*DayDateTim?= =?UTF-8?q?e());=20=20=20to=20make=20it=20a=20'const=20char=20*'.=20-=20Re?= =?UTF-8?q?moved=20delay=5Fms(),=20using=20cCondWait::SleepMs()=20instead.?= =?UTF-8?q?=20-=20Replaced=20time=5Fms()=20with=20a=20threadsafe=20and=20n?= =?UTF-8?q?on-overflowing=20cTimeMs=20(thanks=20to=20Rainer=20=20=20Zochol?= =?UTF-8?q?l=20for=20pointing=20out=20this=20problem).=20-=20Added=20cDevi?= =?UTF-8?q?ce::mutexReceiver=20to=20avoid=20a=20race=20condition=20when=20?= =?UTF-8?q?attaching/detaching=20=20=20receivers=20from=20different=20thre?= =?UTF-8?q?ads.=20-=20The=20new=20remote=20control=20button=20"Audio"=20ca?= =?UTF-8?q?n=20be=20used=20to=20switch=20between=20different=20=20=20audio?= =?UTF-8?q?=20tracks.=20The=20"Green"=20button=20in=20the=20"Main"=20menu?= =?UTF-8?q?=20has=20been=20changed=20from=20"Language"=20=20=20to=20"Audio?= =?UTF-8?q?",=20since=20it=20now=20also=20controls=20switching=20between?= =?UTF-8?q?=20normal=20and=20Dolby=20Digital=20=20=20audio=20tracks=20(see?= =?UTF-8?q?=20MANUAL=20for=20details).=20-=20The=20description=20of=20the?= =?UTF-8?q?=20audio=20tracks=20is=20now=20taken=20from=20the=20"component?= =?UTF-8?q?=20descriptors"=20=20=20that=20are=20broadcast=20in=20the=20EPG?= =?UTF-8?q?=20data.=20However=20(as=20no=20big=20surprise),=20not=20all=20?= =?UTF-8?q?channels=20=20=20actually=20provide=20useful=20data=20here,=20s?= =?UTF-8?q?o=20there=20are=20now=20some=20additional=20EPG=20bugfixes,=20?= =?UTF-8?q?=20=20which=20can=20be=20activated=20by=20setting=20the=20"EPG?= =?UTF-8?q?=20bugfix=20level"=20to=203.=20-=20The=20format=20of=20the=20'e?= =?UTF-8?q?pg.data'=20files=20has=20been=20extended=20by=20the=20new=20tag?= =?UTF-8?q?=20'X',=20which=20=20=20contains=20the=20stream=20components=20?= =?UTF-8?q?of=20an=20event=20(see=20man=20vdr(5)=20for=20details).=20-=20T?= =?UTF-8?q?he=20cStatus=20class=20now=20has=20the=20new=20member=20functio?= =?UTF-8?q?n=20SetAudioTrack(),=20which=20can=20be=20=20=20used=20to=20get?= =?UTF-8?q?=20notified=20when=20the=20audio=20track=20has=20been=20switche?= =?UTF-8?q?d,=20and=20the=20new=20member=20=20=20function=20SetAudioChanne?= =?UTF-8?q?l()=20which=20is=20called=20when=20the=20audio=20channel=20is?= =?UTF-8?q?=20changed.=20-=20Skins=20need=20to=20implement=20the=20new=20c?= =?UTF-8?q?SkinDisplayTrack=20class=20to=20display=20the=20audio=20=20=20t?= =?UTF-8?q?rack=20menu.=20-=20The=20ST:TNG=20skin=20now=20displays=20the?= =?UTF-8?q?=20current=20audio=20track=20description=20(if=20any)=20at=20th?= =?UTF-8?q?e=20=20=20botton=20left=20side.=20-=20The=20new=20setup=20optio?= =?UTF-8?q?n=20"DVB/Audio=20languages"=20can=20be=20used=20to=20control=20?= =?UTF-8?q?which=20audio=20=20=20language=20shall=20be=20selected=20in=20c?= =?UTF-8?q?ase=20a=20channel=20broadcasts=20in=20different=20languages=20?= =?UTF-8?q?=20=20(see=20MANUAL=20for=20details).=20-=20The=20"Left"=20and?= =?UTF-8?q?=20"Right"=20keys=20in=20the=20"Audio"=20menu=20can=20be=20used?= =?UTF-8?q?=20to=20switch=20between=20=20=20the=20left=20and=20right=20ste?= =?UTF-8?q?reo=20channels=20in=20case=20there=20are=20different=20audio=20?= =?UTF-8?q?tracks=20=20=20in=20these=20channels=20(see=20MANUAL=20for=20de?= =?UTF-8?q?tails).=20-=20Fixed=20a=20possible=20race=20condition=20in=20cD?= =?UTF-8?q?evice::Action()=20(thanks=20to=20Mattias=20Gr=C3=B6nlund).=20-?= =?UTF-8?q?=20Fixed=20the=20default=20quality=20value=20when=20grabbing=20?= =?UTF-8?q?a=20JPEG=20image=20(thanks=20to=20Patrick=20=20=20Gleichmann).?= =?UTF-8?q?=20-=20Fixed=20deleting=20a=20menu=20item=20in=20case=20the=20n?= =?UTF-8?q?ext=20item=20is=20not=20selectable=20(thanks=20to=20=20=20Dino?= =?UTF-8?q?=20Ravnic).=20-=20Implemented=20displaying=20mandatory=20subtit?= =?UTF-8?q?les=20in=20the=20SPU=20decoder=20(thanks=20to=20Marco=20=20=20S?= =?UTF-8?q?chl=C3=BC=C3=9Fler).=20-=20The=20setup=20option=20"Recording/Re?= =?UTF-8?q?cord=20Dolby=20Digital"=20has=20been=20renamed=20and=20moved=20?= =?UTF-8?q?to=20=20=20"DVB/Use=20Dolby=20Digital".=20It=20now=20controls?= =?UTF-8?q?=20whether=20Dolby=20Digital=20is=20recorded=20and=20=20=20whet?= =?UTF-8?q?her=20an=20available=20DD=20audio=20track=20will=20appear=20in?= =?UTF-8?q?=20the=20"Audio"=20menu.=20-=20Added=20support=20for=20circular?= =?UTF-8?q?=20polarization=20(thanks=20to=20Jonan=20Santiago).=20-=20Thank?= =?UTF-8?q?s=20to=20Werner=20Fink,=20Reinhard=20Nissl,=20Sascha=20Volkenan?= =?UTF-8?q?dt=20and=20Bj=C3=B8rnar=20Nilsen=20for=20=20=20their=20support?= =?UTF-8?q?=20in=20testing=20and=20fine=20tuning=20this=20version.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- channels.c | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) (limited to 'channels.c') diff --git a/channels.c b/channels.c index 5d500ec..9403ef5 100644 --- a/channels.c +++ b/channels.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: channels.c 1.31 2004/11/02 18:07:05 kls Exp $ + * $Id: channels.c 1.33 2004/12/26 12:34:52 kls Exp $ */ #include "channels.h" @@ -146,10 +146,10 @@ tChannelID tChannelID::FromString(const char *s) return tChannelID::InvalidID; } -const char *tChannelID::ToString(void) +cString tChannelID::ToString(void) { - static char buffer[256]; - snprintf(buffer, sizeof(buffer), rid ? "%s-%d-%d-%d-%d" : "%s-%d-%d-%d", cSource::ToString(source), nid, tid, sid, rid); + char buffer[256]; + snprintf(buffer, sizeof(buffer), rid ? "%s-%d-%d-%d-%d" : "%s-%d-%d-%d", *cSource::ToString(source), nid, tid, sid, rid); return buffer; } @@ -162,8 +162,6 @@ tChannelID &tChannelID::ClrPolarization(void) // -- cChannel --------------------------------------------------------------- -char *cChannel::buffer = NULL; - cChannel::cChannel(void) { name = strdup(""); @@ -289,7 +287,7 @@ bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarizatio if (source != Source || frequency != Frequency || polarization != Polarization || srate != Srate || coderateH != CoderateH) { if (Number()) { - dsyslog("changing transponder data of channel %d from %s:%d:%c:%d:%d to %s:%d:%c:%d:%d", Number(), cSource::ToString(source), frequency, polarization, srate, coderateH, cSource::ToString(Source), Frequency, Polarization, Srate, CoderateH); + dsyslog("changing transponder data of channel %d from %s:%d:%c:%d:%d to %s:%d:%c:%d:%d", Number(), *cSource::ToString(source), frequency, polarization, srate, coderateH, *cSource::ToString(Source), Frequency, Polarization, Srate, CoderateH); modification |= CHANNELMOD_TRANSP; Channels.SetModified(); } @@ -307,7 +305,7 @@ bool cChannel::SetCableTransponderData(int Source, int Frequency, int Modulation { if (source != Source || frequency != Frequency || modulation != Modulation || srate != Srate || coderateH != CoderateH) { if (Number()) { - dsyslog("changing transponder data of channel %d from %s:%d:%d:%d:%d to %s:%d:%d:%d:%d", Number(), cSource::ToString(source), frequency, modulation, srate, coderateH, cSource::ToString(Source), Frequency, Modulation, Srate, CoderateH); + dsyslog("changing transponder data of channel %d from %s:%d:%d:%d:%d to %s:%d:%d:%d:%d", Number(), *cSource::ToString(source), frequency, modulation, srate, coderateH, *cSource::ToString(Source), Frequency, Modulation, Srate, CoderateH); modification |= CHANNELMOD_TRANSP; Channels.SetModified(); } @@ -324,7 +322,7 @@ bool cChannel::SetTerrTransponderData(int Source, int Frequency, int Bandwidth, { if (source != Source || frequency != Frequency || bandwidth != Bandwidth || modulation != Modulation || hierarchy != Hierarchy || coderateH != CoderateH || coderateL != CoderateL || guard != Guard || transmission != Transmission) { if (Number()) { - dsyslog("changing transponder data of channel %d from %s:%d:%d:%d:%d:%d:%d:%d:%d to %s:%d:%d:%d:%d:%d:%d:%d:%d", Number(), cSource::ToString(source), frequency, bandwidth, modulation, hierarchy, coderateH, coderateL, guard, transmission, cSource::ToString(Source), Frequency, Bandwidth, Modulation, Hierarchy, CoderateH, CoderateL, Guard, Transmission); + dsyslog("changing transponder data of channel %d from %s:%d:%d:%d:%d:%d:%d:%d:%d to %s:%d:%d:%d:%d:%d:%d:%d:%d", Number(), *cSource::ToString(source), frequency, bandwidth, modulation, hierarchy, coderateH, coderateL, guard, transmission, *cSource::ToString(Source), Frequency, Bandwidth, Modulation, Hierarchy, CoderateH, CoderateL, Guard, Transmission); modification |= CHANNELMOD_TRANSP; Channels.SetModified(); } @@ -540,13 +538,13 @@ static int PrintParameter(char *p, char Name, int Value) return Value >= 0 && Value != 999 ? sprintf(p, "%c%d", Name, Value) : 0; } -const char *cChannel::ParametersToString(void) const +cString cChannel::ParametersToString(void) const { - char type = *cSource::ToString(source); + char type = **cSource::ToString(source); if (isdigit(type)) type = 'S'; #define ST(s) if (strchr(s, type)) - static char buffer[64]; + char buffer[64]; char *q = buffer; *q = 0; ST(" S ") q += sprintf(q, "%c", polarization); @@ -600,7 +598,7 @@ bool cChannel::StringToParameters(const char *s) return true; } -const char *cChannel::ToText(const cChannel *Channel) +cString cChannel::ToText(const cChannel *Channel) { char FullName[strlen(Channel->name) + 1 + strlen(Channel->shortName) + 1 + strlen(Channel->provider) + 1 + 10]; // +10: paranoia char *q = FullName; @@ -611,7 +609,7 @@ const char *cChannel::ToText(const cChannel *Channel) q += sprintf(q, ";%s", Channel->provider); *q = 0; strreplace(FullName, ':', '|'); - free(buffer); + char *buffer; if (Channel->groupSep) { if (Channel->number) asprintf(&buffer, ":@%d %s\n", Channel->number, FullName); @@ -637,12 +635,12 @@ const char *cChannel::ToText(const cChannel *Channel) q = caidbuf; q += IntArrayToString(q, Channel->caids, 16); *q = 0; - asprintf(&buffer, "%s:%d:%s:%s:%d:%s:%s:%d:%s:%d:%d:%d:%d\n", FullName, Channel->frequency, Channel->ParametersToString(), cSource::ToString(Channel->source), Channel->srate, vpidbuf, apidbuf, Channel->tpid, caidbuf, Channel->sid, Channel->nid, Channel->tid, Channel->rid); + asprintf(&buffer, "%s:%d:%s:%s:%d:%s:%s:%d:%s:%d:%d:%d:%d\n", FullName, Channel->frequency, *Channel->ParametersToString(), *cSource::ToString(Channel->source), Channel->srate, vpidbuf, apidbuf, Channel->tpid, caidbuf, Channel->sid, Channel->nid, Channel->tid, Channel->rid); } return buffer; } -const char *cChannel::ToText(void) const +cString cChannel::ToText(void) const { return ToText(this); } @@ -705,7 +703,8 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID) p = apidbuf; char *q; int NumApids = 0; - while ((q = strtok(p, ",")) != NULL) { + char *strtok_next; + while ((q = strtok_r(p, ",", &strtok_next)) != NULL) { if (NumApids < MAXAPIDS) { char *l = strchr(q, '='); if (l) { @@ -725,7 +724,8 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID) char *p = dpidbuf; char *q; int NumDpids = 0; - while ((q = strtok(p, ",")) != NULL) { + char *strtok_next; + while ((q = strtok_r(p, ",", &strtok_next)) != NULL) { if (NumDpids < MAXAPIDS) { char *l = strchr(q, '='); if (l) { @@ -747,7 +747,8 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID) char *p = caidbuf; char *q; int NumCaIds = 0; - while ((q = strtok(p, ",")) != NULL) { + char *strtok_next; + while ((q = strtok_r(p, ",", &strtok_next)) != NULL) { if (NumCaIds < MAXCAIDS) { caids[NumCaIds++] = strtol(q, NULL, 16) & 0xFFFF; if (NumCaIds == 1 && caids[0] <= 0x00FF) @@ -797,7 +798,7 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID) bool cChannel::Save(FILE *f) { - return fprintf(f, ToText()) > 0; + return fprintf(f, "%s", *ToText()) > 0; } // -- cChannels -------------------------------------------------------------- @@ -936,7 +937,7 @@ int cChannels::Modified(void) cChannel *cChannels::NewChannel(const cChannel *Transponder, const char *Name, const char *ShortName, const char *Provider, int Nid, int Tid, int Sid, int Rid) { if (Transponder) { - dsyslog("creating new channel '%s,%s;%s' on %s transponder %d with id %d-%d-%d-%d", Name, ShortName, Provider, cSource::ToString(Transponder->Source()), Transponder->Transponder(), Nid, Tid, Sid, Rid); + dsyslog("creating new channel '%s,%s;%s' on %s transponder %d with id %d-%d-%d-%d", Name, ShortName, Provider, *cSource::ToString(Transponder->Source()), Transponder->Transponder(), Nid, Tid, Sid, Rid); cChannel *NewChannel = new cChannel(*Transponder); NewChannel->SetId(Nid, Tid, Sid, Rid); NewChannel->SetName(Name, ShortName, Provider); @@ -947,9 +948,9 @@ cChannel *cChannels::NewChannel(const cChannel *Transponder, const char *Name, c return NULL; } -const char *ChannelString(const cChannel *Channel, int Number) +cString ChannelString(const cChannel *Channel, int Number) { - static char buffer[256]; + char buffer[256]; if (Channel) { if (Channel->GroupSep()) snprintf(buffer, sizeof(buffer), "%s", Channel->Name()); -- cgit v1.2.3