channel number range limit?
Commit Message
En/na Timothy D. Lenz ha escrit:
> Also, I notice when looking at the channel.conf that channels added from vdr
> rotor plugin don't show up in the conf for at least 5-10 minutes. If you
> shut down or crash before that, the channel entry is lost.
This is by design: the channels are only saved if you manually edit
them, otherwise they'll be saved only after 10 minutes (IIRC).
>
> A request for vdr 1.5 would be multi channel list where each list with
> contain just channels for a given sat or provider, as well as favorites
> list.
for the time being you can try the attached patch
Bye
@@ -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;
}
@@ -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<cChannel> {
@@ -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--; }