Posts by paulpanther

diff -Nur nordlichtsepg-0.9.2/mymenuevent.c nordlichtsepg-mod/mymenuevent.c
--- nordlichtsepg-0.9.2/mymenuevent.c   2017-01-20 00:33:39.000000000 +0100
+++ nordlichtsepg-mod/mymenuevent.c 	2017-03-19 22:38:45.000000000 +0100
@@ -12,7 +12,7 @@
 {
  item=Item;
  event=item->event;
- timer=item->timer;
+ timer=(cTimer*) item->timer;
  channel=item->channel;


  SetTitle(channel->Name());
@@ -55,9 +55,10 @@
   if(event)
   {
	timer=new cTimer(event);
-   Timers.Add(timer);
+   LOCK_TIMERS_WRITE;
+   Timers->Add(timer);
	timer->Matches();
-   Timers.SetModified();
+   Timers->SetModified();
   }
   else
   {
@@ -96,13 +97,15 @@
	if(Interface->Confirm(trVDR("Timer still recording - really delete?")))
	{
 	timer->Skip();
-	cRecordControls::Process(time(NULL));
+	LOCK_TIMERS_WRITE;
+   	cRecordControls::Process(Timers, time(NULL));
	}
	else
 	return osContinue;
   }
-  Timers.Del(timer);
-  Timers.SetModified();
+  LOCK_TIMERS_WRITE;
+  Timers->Del(timer);
+  Timers->SetModified();
   timer=NULL;


   SetHelp(trVDR("Button$Record"),NULL,NULL,trVDR("Button$Switch"));
Binärdateien nordlichtsepg-0.9.2/mymenuevent.o und nordlichtsepg-mod/mymenuevent.o sind verschieden.
diff -Nur nordlichtsepg-0.9.2/mywhatsonitem.c nordlichtsepg-mod/mywhatsonitem.c
--- nordlichtsepg-0.9.2/mywhatsonitem.c 2017-01-20 00:33:39.000000000 +0100
+++ nordlichtsepg-mod/mywhatsonitem.c   2017-03-19 22:52:12.000000000 +0100
@@ -35,7 +35,7 @@
 }


 // --- myWhatsOnItem ----------------------------------------------------------
-myWhatsOnItem::myWhatsOnItem(const cEvent *Event,cChannel *Channel,bool Next)
+myWhatsOnItem::myWhatsOnItem(const cEvent *Event,const cChannel *Channel,bool Next)
 {
   event = Event;
   channel = Channel;
@@ -52,7 +52,8 @@
   const char *m = " ";


   // look for timers
-  for(cTimer *ti = Timers.First();ti;ti = Timers.Next(ti))
+  LOCK_TIMERS_READ;
+  for(const cTimer *ti = Timers->First();ti;ti = Timers->Next(ti))
   {
 	if(ti->Matches(t) && (ti->Channel() == channel))
 	{
diff -Nur nordlichtsepg-0.9.2/mywhatsonitem.h nordlichtsepg-mod/mywhatsonitem.h
--- nordlichtsepg-0.9.2/mywhatsonitem.h 2017-01-20 00:33:39.000000000 +0100
+++ nordlichtsepg-mod/mywhatsonitem.h   2017-03-19 22:43:38.000000000 +0100
@@ -12,9 +12,9 @@
  public:
   const cEvent *event;
   const cChannel *channel;
-  cTimer *timer;
+  const cTimer *timer;
   virtual void Set();
-  myWhatsOnItem(const cEvent *Event,cChannel *Channel,bool Next);
+  myWhatsOnItem(const cEvent *Event,const cChannel *Channel,bool Next);
 };


 class Icons
Binärdateien nordlichtsepg-0.9.2/mywhatsonitem.o und nordlichtsepg-mod/mywhatsonitem.o sind verschieden.
diff -Nur nordlichtsepg-0.9.2/nordlichtsepg.c nordlichtsepg-mod/nordlichtsepg.c
--- nordlichtsepg-0.9.2/nordlichtsepg.c 2017-01-20 00:33:39.000000000 +0100
+++ nordlichtsepg-mod/nordlichtsepg.c   2017-03-19 22:51:33.000000000 +0100
@@ -5,7 +5,7 @@
 #include "nordlichtsepg.h"
 #include "mymenuevent.h"


-#define CHNUMWIDTH (numdigits(Channels.MaxNumber()))
+#define CHNUMWIDTH (numdigits(cChannels::MaxNumber()))


 static const char *VERSION    	= "0.9";
 static const char *DESCRIPTION	= tr("Extended EPG");
@@ -63,8 +63,8 @@
   bool next,jumpto;
   char tmp[16];
   int currentChannel,hh,mm,index;
-  const cSchedules *schedules;
-  cSchedulesLock schedulesLock;
+  //const cSchedules *schedules;
+  //cSchedulesLock schedulesLock;


   void LoadSchedules(int shift);
   void GoToDay(int day);
@@ -117,14 +117,16 @@


  Clear();


- schedules=cSchedules::Schedules(schedulesLock);
- for(cChannel *Channel=Channels.First();Channel;Channel=Channels.Next(Channel))
+ LOCK_SCHEDULES_READ;
+ //schedules=cSchedules::Schedules(schedulesLock);
+ LOCK_CHANNELS_READ;
+for(const cChannel *Channel=Channels->First();Channel;Channel=Channels->Next(Channel))
  {
   if(!(!Channel->Vpid()&&Channel->Apid(0)&&hideradiochannels||Channel->Ca()&&hideencryptedchannels))
   {
	if(!Channel->GroupSep())
	{
-	const cSchedule *Schedule=schedules->GetSchedule(Channel->GetChannelID());
+	const cSchedule *Schedule = Schedules->GetSchedule(Channel->GetChannelID());
 	// if there is no cSchedule we can't get infos
 	if(Schedule)
 	{