From patchwork Wed Mar 30 11:09:54 2005 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Olivetti X-Patchwork-Id: 11834 Received: from 232.red-213-97-27.pooles.rima-tde.net ([213.97.27.232]) by www.linuxtv.org with esmtp (Exim 4.34) id 1DGb5Q-0007PS-1R for vdr@linuxtv.org; Wed, 30 Mar 2005 13:10:12 +0200 Received: from [127.0.0.1] (localhost.localdomain [127.0.0.1]) by 232.Red-213-97-27.pooles.rima-tde.net (Postfix) with ESMTP id 05C3918A8590 for ; Wed, 30 Mar 2005 13:09:54 +0200 (CEST) Message-ID: <424A8902.8000605@ventoso.org> Date: Wed, 30 Mar 2005 13:09:54 +0200 From: Luca Olivetti User-Agent: Mozilla Thunderbird 0.9 (X11/20041103) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Klaus Schmidinger's VDR Subject: Re: [vdr] Rotor plugins and patches References: <424A8823.6000006@mclink.it> In-Reply-To: <424A8823.6000006@mclink.it> X-Enigmail-Version: 0.89.0.0 X-Enigmail-Supports: pgp-inline, pgp-mime X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Klaus Schmidinger's VDR List-Id: Klaus Schmidinger's VDR List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Mar 2005 11:10:13 -0000 Status: O X-Status: X-Keywords: X-UID: 1241 mc8647 wrote: > I also remember an announce for a patch that adds new found channels in > appropriate zones in channels.conf, one zone for one satellite. Attached. Bye --- channels.c.newchannels 2005-02-06 10:44:53.000000000 +0100 +++ channels.c 2005-02-13 16:48:07.825253533 +0100 @@ -536,6 +536,11 @@ refChannel = RefChannel; } +void cChannel::SetGroupSep(bool Sep) +{ + groupSep = Sep; +} + static int PrintParameter(char *p, char Name, int Value) { return Value >= 0 && Value != 999 ? sprintf(p, "%c%d", Name, Value) : 0; @@ -909,6 +914,16 @@ return NULL; } +cChannel *cChannels::GetByName(char *Name) +{ + for (cChannel *channel = First(); channel; channel = Next(channel)) + { + if (strcmp(channel->Name(), Name)==0) + return channel; + } + return NULL; +} + bool cChannels::HasUniqueChannelID(cChannel *NewChannel, cChannel *OldChannel) { tChannelID NewChannelID = NewChannel->GetChannelID(); @@ -944,7 +959,33 @@ cChannel *NewChannel = new cChannel(*Transponder); NewChannel->SetId(Nid, Tid, Sid, Rid); NewChannel->SetName(Name, ShortName, Provider); +#if 0 Add(NewChannel); +#else + /* find group separator for the source of this channel */ + { + char buffer[64]; + snprintf(buffer, sizeof(buffer), "New Channels @ %s", + *cSource::ToString(NewChannel->Source()) ); + cChannel *groupSep = GetByName(buffer); + if(!groupSep) // group separator for this source doesn't exist, so lets create it + { + groupSep = new cChannel(); + groupSep->SetName(buffer, "", ""); + groupSep->SetGroupSep(true); + Add(groupSep); + } else // find next separator or last channel + { + cChannel *nextChannel=Next(groupSep); + while (nextChannel && !nextChannel->GroupSep()) + { + groupSep=nextChannel; + nextChannel=Next(nextChannel); + } + } + Add(NewChannel, groupSep); + } +#endif ReNumber(); return NewChannel; } --- channels.h.newchannels 2005-01-16 14:46:41.000000000 +0100 +++ channels.h 2005-02-13 16:45:39.327608385 +0100 @@ -191,6 +191,7 @@ void SetCaDescriptors(int Level); void SetLinkChannels(cLinkChannels *LinkChannels); void SetRefChannel(cChannel *RefChannel); + void SetGroupSep(bool Sep = true); }; class cChannels : public cRwLock, public cConfig { @@ -208,6 +209,7 @@ cChannel *GetByNumber(int Number, int SkipGap = 0); cChannel *GetByServiceID(int Source, int Transponder, unsigned short ServiceID); cChannel *GetByChannelID(tChannelID ChannelID, bool TryWithoutRid = false, bool TryWithoutPolarization = false); + cChannel *GetByName(char *Name); int BeingEdited(void) { return beingEdited; } void IncBeingEdited(void) { beingEdited++; } void DecBeingEdited(void) { beingEdited--; }