Beiträge von Grégoire

diff -pu vdr-1.3.30/channels.c.orig vdr-1.3.30/channels.c
--- vdr-1.3.30/channels.c.orig  Sat Aug  6 14:22:41 2005
+++ vdr-1.3.30/channels.c       Mon Aug 22 20:06:33 2005
@@ -444,6 +444,25 @@ void cChannel::SetPids(int Vpid, int Ppi
         }
      *q = 0;
      dsyslog("changing pids of channel %d from %d+%d:%s:%d to %d+%d:%s:%d", Number(), vpid, ppid, OldApidsBuf, tpid, Vpid, Ppid, NewApidsBuf, Tpid);
+     if (!vpid && !apids[0]) {
+         // new channel: find group seperator for the source of this channel
+         char sepname[64];
+         snprintf(sepname, sizeof(sepname), "New %s Channels @ %s",
+            (Vpid ? "TV" : "Radio"), *cSource::ToString(source));
+         cChannel *groupSep = Channels.GetByName(sepname);
+         if (!groupSep) {
+             // group separator doesn't exist, create it
+             groupSep = new cChannel();
+             groupSep->SetName(sepname, "", "");
+             groupSep->SetGroupSep(true);
+             Channels.Add(groupSep);
+             isyslog("creating separator '%s'", sepname);
+             }
+         isyslog("%s: %s,%s;%s", sepname, Name(), ShortName(), Provider());
+         Channels.Del(this, false);
+         Channels.Add(this, groupSep);  // move new channel
+         Channels.ReNumber();
+         }
      vpid = Vpid;
      ppid = Ppid;
      for (int i = 0; i < MAXAPIDS; i++) {
@@ -543,6 +562,11 @@ void cChannel::SetRefChannel(cChannel *R
   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;
@@ -948,6 +972,16 @@ cChannel *cChannels::GetByChannelID(tCha
             return channel;
          }
      }
+  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;
 }


diff -pu vdr-1.3.30/channels.h.orig vdr-1.3.30/channels.h
--- vdr-1.3.30/channels.h.orig  Sat Aug  6 13:23:32 2005
+++ vdr-1.3.30/channels.h       Mon Aug 22 20:06:33 2005
@@ -193,6 +193,7 @@ public:
   void SetCaDescriptors(int Level);
   void SetLinkChannels(cLinkChannels *LinkChannels);
   void SetRefChannel(cChannel *RefChannel);
+  void SetGroupSep(bool Sep = true);
   };


 class cChannels : public cRwLock, public cConfig<cChannel> {
@@ -211,6 +212,7 @@ public:
   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--; }

...
make[1]: Entering directory `/var/tmp/portage/libdvb-0.5.5-r1/work/libdvb-0.5.5/libdvb'
make[1]: warning: jobserver unavailable: using -j1.  Add `+' to parent make rule.
g++ -I. -I../include -I../../include -I/usr/include/ -O2 -Wall -g -c devices.cc
make -C libdvbci main
make[1]: Entering directory `/var/tmp/portage/libdvb-0.5.5-r1/work/libdvb-0.5.5/libdvbci'
make[1]: warning: jobserver unavailable: using -j1.  Add `+' to parent make rule.
g++ -I. -I../include -I../../include -I/usr/include/ -O2 -Wall -g -c ci.cc
ar -rcs libdvbci.a ci.o 
make[1]: Leaving directory `/var/tmp/portage/libdvb-0.5.5-r1/work/libdvb-0.5.5/libdvbci'
make -C libdvbmpeg libdvbmpegtools.a
make[1]: Entering directory `/var/tmp/portage/libdvb-0.5.5-r1/work/libdvb-0.5.5/libdvbmpeg'
Makefile:36: .depend: No such file or directory
make[1]: warning: jobserver unavailable: using -j1.  Add `+' to parent make rule.
g++  -M ctools.c remux.c ringbuffy.c transform.c cpptools.cc   -I. -I../include -I../../include -I/usr/include/> .depend
g++ -I. -I../include -I../../include -I/usr/include/ -O2 -Wall -g -c DVB.cc
make[1]: Leaving directory `/var/tmp/portage/libdvb-0.5.5-r1/work/libdvb-0.5.5/libdvbmpeg'
make[1]: Entering directory `/var/tmp/portage/libdvb-0.5.5-r1/work/libdvb-0.5.5/libdvbmpeg'
make[1]: warning: jobserver unavailable: using -j1.  Add `+' to parent make rule.
cc -c -O2 -Wall -g -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -I. -I../include -I../../include -I/usr/include/  ctools.c
DVB.cc: In function `int chck_frontend(int, frontend_stat*)':
DVB.cc:3571: error: `errno' undeclared (first use this function)
DVB.cc:3571: error: (Each undeclared identifier is reported only once for each function it appears in.)
make[1]: *** [DVB.o] Error 1
make[1]: Leaving directory `/var/tmp/portage/libdvb-0.5.5-r1/work/libdvb-0.5.5/libdvb'
make: *** [libdvb/libdvb.a] Error 2
make: *** Waiting for unfinished jobs....
cc -c -O2 -Wall -g -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -I. -I../include -I../../include -I/usr/include/  ringbuffy.c
ringbuffy.c: In function `ring_write':
ringbuffy.c:62: warning: implicit declaration of function `memcpy'
cc -c -O2 -Wall -g -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -I. -I../include -I../../include -I/usr/include/  transform.c
transform.c: In function `ts_demux':
transform.c:2526: warning: cast from pointer to integer of different size
transform.c:2543: warning: cast from pointer to integer of different size
g++ -c -O2 -Wall -g -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -I. -I../include -I../../include -I/usr/include/  cpptools.cc
ar -rcs libdvbmpegtools.a ctools.o ringbuffy.o transform.o cpptools.o 
make[1]: Leaving directory `/var/tmp/portage/libdvb-0.5.5-r1/work/libdvb-0.5.5/libdvbmpeg'


!!! ERROR: media-libs/libdvb-0.5.5-r1 failed.
!!! Function src_compile, Line 58, Exitcode 2
!!! compile problem
!!! If you need support, post the topmost build error, NOT this status message.