correct output of double values, e.g. frames per second

Author: flensrocker

HISTORY

@@ -245,3 +245,6 @@ VDR Plugin 'dbus2vdr' Revision History
 
 2016-03-09: Version 30
 - add timer.ListDetailed
+
+2016-12-11: Version 31
+- correct output of "frames per second"

dbus2vdr.c

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

helper.c

@@ -64,6 +64,22 @@ void cDBusHelper::ToUtf8(cString &text)
      }
 }
 
+void  cDBusHelper::AddKeyDouble(GVariantBuilder *Array, const char *Key, double Value)
+{
+  GVariantBuilder *element = g_variant_builder_new(G_VARIANT_TYPE("(sv)"));
+
+  g_variant_builder_add(element, "s", Key);
+
+  GVariantBuilder *variant = g_variant_builder_new(G_VARIANT_TYPE("v"));
+  g_variant_builder_add(variant, "d", Value);
+  g_variant_builder_add_value(element, g_variant_builder_end(variant));
+
+  g_variant_builder_add_value(Array, g_variant_builder_end(element));
+
+  g_variant_builder_unref(variant);
+  g_variant_builder_unref(element);
+}
+
 void  cDBusHelper::AddKeyValue(GVariantBuilder *Array, const char *Key, const gchar *Type, void **Value)
 {
   GVariantBuilder *element = g_variant_builder_new(G_VARIANT_TYPE("(sv)"));

helper.h

@@ -16,6 +16,7 @@ class cDBusHelper
   static bool IsValidUtf8(const char *text);
   static void ToUtf8(cString &text);
 
+  static void AddKeyDouble(GVariantBuilder *Array, const char *Key, double Value);
   static void AddKeyValue(GVariantBuilder *Array, const char *Key, const gchar *Type, void **Value);
   static void SendReply(GDBusMethodInvocation *Invocation, int  ReplyCode, const char *ReplyMessage);
 };

recording.c

@@ -33,7 +33,6 @@ class cDBusRecordingsHelper
        gboolean b;
        guint64 tu64;
        int i;
-       gdouble d;
 
        c = recording->FileName();
        if (c != NULL)
@@ -62,8 +61,7 @@ class cDBusRecordingsHelper
        cDBusHelper::AddKeyValue(array, "Lifetime", "i", (void**)&i);
        i = recording->HierarchyLevels();
        cDBusHelper::AddKeyValue(array, "HierarchyLevels", "i", (void**)&i);
-       d = recording->FramesPerSecond();
-       cDBusHelper::AddKeyValue(array, "FramesPerSecond", "d", (void**)&d);
+       cDBusHelper::AddKeyDouble(array, "FramesPerSecond", recording->FramesPerSecond());
        i = recording->NumFrames();
        cDBusHelper::AddKeyValue(array, "NumFrames", "i", (void**)&i);
        i = recording->LengthInSeconds();
@@ -97,8 +95,7 @@ class cDBusRecordingsHelper
           c = info->Aux();
           if (c != NULL)
              cDBusHelper::AddKeyValue(array, "Info/Aux", "s", (void**)&c);
-          d = info->FramesPerSecond();
-          cDBusHelper::AddKeyValue(array, "Info/FramesPerSecond", "d", (void**)&d);
+          cDBusHelper::AddKeyDouble(array, "Info/FramesPerSecond", info->FramesPerSecond());
           const cComponents *components = info->Components();
           if ((components != NULL) && (components->NumComponents() > 0)) {
              for (int comp = 0; comp < components->NumComponents(); comp++) {