add support for vdr 2.3.1

Author: flensrocker

HISTORY

@@ -233,3 +233,6 @@ VDR Plugin 'dbus2vdr' Revision History
 
 2013-07-10: Version 14
 - add method "IsReplaying" to status interface
+
+2015-09-30: Version 26
+- make compatible with vdr 2.3.1

channel.c

@@ -29,7 +29,7 @@ namespace cDBusChannelsHelper
     "  </interface>\n"
     "</node>\n";
 
-  static void AddChannel(GVariantBuilder *Array, cChannel *Channel)
+  static void AddChannel(GVariantBuilder *Array, const cChannel *Channel)
   {
     if (Channel == NULL)
        return;
@@ -46,7 +46,14 @@ namespace cDBusChannelsHelper
 
   static void Count(cDBusObject *Object, GVariant *Parameters, GDBusMethodInvocation *Invocation)
   {
-    g_dbus_method_invocation_return_value(Invocation, g_variant_new("(i)", Channels.Count()));
+    const cChannels *channels = NULL;
+#if VDRVERSNUM > 20300
+    LOCK_CHANNELS_READ;
+    channels = Channels;
+#else
+    channels = &Channels;
+#endif
+    g_dbus_method_invocation_return_value(Invocation, g_variant_new("(i)", channels->Count()));
   }
 
   static void GetFromTo(cDBusObject *Object, GVariant *Parameters, GDBusMethodInvocation *Invocation)
@@ -60,10 +67,17 @@ namespace cDBusChannelsHelper
 
     GVariantBuilder *array = g_variant_builder_new(G_VARIANT_TYPE("a(is)"));
 
-    cChannel *c = Channels.Get(from_index);
+    const cChannels *channels = NULL;
+#if VDRVERSNUM > 20300
+    LOCK_CHANNELS_READ;
+    channels = Channels;
+#else
+    channels = &Channels;
+#endif
+    const cChannel *c = channels->Get(from_index);
     while ((c != NULL) && (to_index >= from_index)) {
        cDBusChannelsHelper::AddChannel(array, c);
-       c = Channels.Next(c);
+       c = channels->Next(c);
        to_index--;
        }
 
@@ -85,9 +99,16 @@ namespace cDBusChannelsHelper
 
     GVariantBuilder *array = g_variant_builder_new(G_VARIANT_TYPE("a(is)"));
 
+    const cChannels *channels = NULL;
+#if VDRVERSNUM > 20300
+    LOCK_CHANNELS_READ;
+    channels = Channels;
+#else
+    channels = &Channels;
+#endif
     if ((option != NULL) && *option && !withGroupSeps) {
        if (isnumber(option)) {
-          cChannel *channel = Channels.GetByNumber(strtol(option, NULL, 10));
+          const cChannel *channel = channels->GetByNumber(strtol(option, NULL, 10));
           if (channel)
              cDBusChannelsHelper::AddChannel(array, channel);
           else {
@@ -96,9 +117,9 @@ namespace cDBusChannelsHelper
              }
           }
        else {
-          cChannel *next = Channels.GetByChannelID(tChannelID::FromString(option));
+          const cChannel *next = channels->GetByChannelID(tChannelID::FromString(option));
           if (!next) {
-             for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) {
+             for (const cChannel *channel = channels->First(); channel; channel = channels->Next(channel)) {
                 if (!channel->GroupSep()) {
                    if (strcasestr(channel->Name(), option)) {
                       if (next)
@@ -116,8 +137,8 @@ namespace cDBusChannelsHelper
              }
           }
        }
-    else if (Channels.MaxNumber() >= 1) {
-            for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) {
+    else if (channels->MaxNumber() >= 1) {
+            for (const cChannel *channel = channels->First(); channel; channel = channels->Next(channel)) {
                 if (withGroupSeps || !channel->GroupSep())
                    cDBusChannelsHelper::AddChannel(array, channel);
                 }

dbus2vdr.c

@@ -37,7 +37,7 @@
 #include "avahi-helper.h"
 
 
-static const char *VERSION        = "25";
+static const char *VERSION        = "26";
 static const char *DESCRIPTION    = trNOOP("control vdr via D-Bus");
 static const char *MAINMENUENTRY  = NULL;
 

epg.c

@@ -7,6 +7,7 @@
 #include <vdr/eit.h>
 #include <vdr/epg.h>
 #include <vdr/svdrp.h>
+#include <vdr/timers.h>
 
 
 namespace cDBusEpgHelper
@@ -110,13 +111,27 @@ namespace cDBusEpgHelper
        tChannelID ChannelID = tChannelID::InvalidID;
        if (isnumber(channel)) {
           int o = strtol(channel, NULL, 10);
-          if (o >= 1 && o <= Channels.MaxNumber())
-             ChannelID = Channels.GetByNumber(o)->GetChannelID();
+          const cChannels *channels = NULL;
+#if VDRVERSNUM > 20300
+          LOCK_CHANNELS_READ;
+          channels = Channels;
+#else
+          channels = &Channels;
+#endif
+          if (o >= 1 && o <= channels->MaxNumber())
+             ChannelID = channels->GetByNumber(o)->GetChannelID();
           }
        else {
           ChannelID = tChannelID::FromString(channel);
           if (ChannelID == tChannelID::InvalidID) {
-             for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+             const cChannels *channels = NULL;
+#if VDRVERSNUM > 20300
+             LOCK_CHANNELS_READ;
+             channels = Channels;
+#else
+             channels = &Channels;
+#endif
+             for (const cChannel *Channel = channels->First(); Channel; Channel = channels->Next(Channel)) {
                  if (!Channel->GroupSep()) {
                     if (strcasecmp(Channel->Name(), channel) == 0) {
                        ChannelID = Channel->GetChannelID();
@@ -127,8 +142,13 @@ namespace cDBusEpgHelper
              }
           }
        if (!(ChannelID == tChannelID::InvalidID)) {
+#if VDRVERSNUM > 20300
+          cStateKey StateKey;
+          cSchedules *s = cSchedules::GetSchedulesWrite(StateKey, 1000);
+#else
           cSchedulesLock SchedulesLock(true, 1000);
           cSchedules *s = (cSchedules *)cSchedules::Schedules(SchedulesLock);
+#endif
           if (s) {
              cSchedule *Schedule = NULL;
              ChannelID.ClrRid();
@@ -150,6 +170,9 @@ namespace cDBusEpgHelper
                 cString replyMessage = cString::sprintf("No EPG data found for channel \"%s\"", channel);
                 cDBusHelper::SendReply(Invocation, 550, *replyMessage);
                 }
+#if VDRVERSNUM > 20300
+             StateKey.Remove();
+#endif
              }
           else
              cDBusHelper::SendReply(Invocation, 451, "Can't get EPG data");
@@ -160,10 +183,17 @@ namespace cDBusEpgHelper
           }
        }
     else {
+#if VDRVERSNUM > 20300
+       LOCK_TIMERS_WRITE;
+       LOCK_SCHEDULES_WRITE;
+       for (cTimer *Timer = Timers->First(); Timer; Timer = Timers->Next(Timer))
+           Timer->SetEvent(NULL); // processing all timers here (local *and* remote)
+       for (cSchedule *Schedule = Schedules->First(); Schedule; Schedule = Schedules->Next(Schedule))
+           Schedule->Cleanup(INT_MAX);
+#else
        cSchedules::ClearAll();
-       #if APIVERSNUM >= 10711
+#endif
        cEitFilter::SetDisableUntil(time(NULL) + eitDisableTime);
-       #endif
        cDBusHelper::SendReply(Invocation, 250, "EPG data cleared");
        }
   };
@@ -179,6 +209,9 @@ namespace cDBusEpgHelper
        return;
        }
 
+#if VDRVERSNUM > 20300
+    cDBusHelper::SendReply(Invocation, 554, "cPUTEHandler not available in vdr 2.3.1");
+#else
     cPUTEhandler *handler = new cPUTEhandler();
     if (handler->Status() == 354) {
        for (gsize i = 0; i < len; i++) {
@@ -193,6 +226,7 @@ namespace cDBusEpgHelper
        }
     cDBusHelper::SendReply(Invocation, handler->Status(), handler->Message());
     delete handler;
+#endif
     g_free(line);
   };
 
@@ -285,7 +319,7 @@ namespace cDBusEpgHelper
     g_variant_builder_unref(arr);
   }
 
-  static bool sGetChannel(GVariant *Arg, const char **Input, cChannel **Channel)
+  static bool sGetChannel(GVariant *Arg, const char **Input, const cChannels* Channels, const cChannel **Channel)
   {
     *Channel = NULL;
     *Input = NULL;
@@ -294,9 +328,9 @@ namespace cDBusEpgHelper
        if (**Input == 0)
           return true;
        if (isnumber(*Input))
-          *Channel = Channels.GetByNumber(strtol(*Input, NULL, 10));
+          *Channel = Channels->GetByNumber(strtol(*Input, NULL, 10));
        else
-          *Channel = Channels.GetByChannelID(tChannelID::FromString(*Input));
+          *Channel = Channels->GetByChannelID(tChannelID::FromString(*Input));
        if (*Channel == NULL)
           return false;
        }
@@ -320,12 +354,19 @@ namespace cDBusEpgHelper
 
   static void sGetEntries(cDBusObject *Object, GVariant *Parameters, GDBusMethodInvocation *Invocation, eMode mode)
   {
-    cChannel *channel = NULL;
+    const cChannels *channels = NULL;
+#if VDRVERSNUM > 20300
+    LOCK_CHANNELS_READ;
+    channels = Channels;
+#else
+    channels = &Channels;
+#endif
+    const cChannel *channel = NULL;
     guint64 atTime = 0;
     GVariant *first = g_variant_get_child_value(Parameters, 0);
 
     const char *c = NULL;
-    if (!sGetChannel(first, &c, &channel)) {
+    if (!sGetChannel(first, &c, channels, &channel)) {
        cString reply = cString::sprintf("channel \"%s\" not defined", c);
        esyslog("dbus2vdr: %s.GetEntries: %s", DBUS_VDR_EPG_INTERFACE, *reply);
        sReturnError(Invocation, 501, *reply);
@@ -346,13 +387,19 @@ namespace cDBusEpgHelper
        }
     g_variant_unref(first);
 
+    const cSchedules *scheds = NULL;
+#if VDRVERSNUM > 20300
+    cStateKey StateKey;
+    scheds = cSchedules::GetSchedulesRead(StateKey, 1000);
+#else
     cSchedulesLock sl(false, 1000);
     if (!sl.Locked()) {
        sReturnError(Invocation, 550, "got no lock on schedules");
        return;
        }
 
-    const cSchedules *scheds = cSchedules::Schedules(sl);
+    scheds = cSchedules::Schedules(sl);
+#endif
     if (scheds == NULL) {
        sReturnError(Invocation, 550, "got no schedules");
        return;
@@ -365,7 +412,7 @@ namespace cDBusEpgHelper
 
     bool next = false;
     if (channel == NULL) {
-       channel = Channels.First();
+       channel = channels->First();
        next = true;
        }
 
@@ -391,11 +438,14 @@ namespace cDBusEpgHelper
                 sAddEvent(array, *e);
              }
           if (next)
-             channel = Channels.Next(channel);
+             channel = channels->Next(channel);
           else
              break;
           }
 
+#if VDRVERSNUM > 20300
+    StateKey.Remove();
+#endif
     g_variant_builder_add_value(builder, g_variant_builder_end(array));
     g_dbus_method_invocation_return_value(Invocation, g_variant_builder_end(builder));
     g_variant_builder_unref(array);