diff -Nru vdr-plugin-dbus2vdr-20160311123752stable/dbus2vdr.c vdr-plugin-dbus2vdr-20161211140556stable/dbus2vdr.c --- vdr-plugin-dbus2vdr-20160311123752stable/dbus2vdr.c 2016-03-11 11:37:52.000000000 +0000 +++ vdr-plugin-dbus2vdr-20161211140556stable/dbus2vdr.c 2016-12-11 13:05:57.000000000 +0000 @@ -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; diff -Nru vdr-plugin-dbus2vdr-20160311123752stable/debian/changelog vdr-plugin-dbus2vdr-20161211140556stable/debian/changelog --- vdr-plugin-dbus2vdr-20160311123752stable/debian/changelog 2016-03-11 11:37:53.000000000 +0000 +++ vdr-plugin-dbus2vdr-20161211140556stable/debian/changelog 2016-12-11 13:05:57.000000000 +0000 @@ -1,6 +1,6 @@ -vdr-plugin-dbus2vdr (20160311123752stable-0yavdr0~trusty) trusty; urgency=medium +vdr-plugin-dbus2vdr (20161211140556stable-0yavdr0~trusty) trusty; urgency=medium - * Autobuild - b'2fe1c386d2f158b32395b0749215f02fd1206769\n' + * Autobuild - b'299b679a719ece01894350743ba98a8b3cdfa5e6\n' git://github.com/yavdr/vdr-plugin-dbus2vdr.git - -- yaVDR Release-Team Fri, 11 Mar 2016 12:37:53 +0100 + -- yaVDR Release-Team Sun, 11 Dec 2016 14:05:57 +0100 diff -Nru vdr-plugin-dbus2vdr-20160311123752stable/.git/hooks/applypatch-msg.sample vdr-plugin-dbus2vdr-20161211140556stable/.git/hooks/applypatch-msg.sample --- vdr-plugin-dbus2vdr-20160311123752stable/.git/hooks/applypatch-msg.sample 2016-03-11 11:37:52.000000000 +0000 +++ vdr-plugin-dbus2vdr-20161211140556stable/.git/hooks/applypatch-msg.sample 2016-12-11 13:05:56.000000000 +0000 @@ -10,6 +10,6 @@ # To enable this hook, rename this file to "applypatch-msg". . git-sh-setup -test -x "$GIT_DIR/hooks/commit-msg" && - exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} : diff -Nru vdr-plugin-dbus2vdr-20160311123752stable/.git/hooks/pre-applypatch.sample vdr-plugin-dbus2vdr-20161211140556stable/.git/hooks/pre-applypatch.sample --- vdr-plugin-dbus2vdr-20160311123752stable/.git/hooks/pre-applypatch.sample 2016-03-11 11:37:52.000000000 +0000 +++ vdr-plugin-dbus2vdr-20161211140556stable/.git/hooks/pre-applypatch.sample 2016-12-11 13:05:56.000000000 +0000 @@ -9,6 +9,6 @@ # To enable this hook, rename this file to "pre-applypatch". . git-sh-setup -test -x "$GIT_DIR/hooks/pre-commit" && - exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} : diff -Nru vdr-plugin-dbus2vdr-20160311123752stable/.git/hooks/pre-push.sample vdr-plugin-dbus2vdr-20161211140556stable/.git/hooks/pre-push.sample --- vdr-plugin-dbus2vdr-20160311123752stable/.git/hooks/pre-push.sample 2016-03-11 11:37:52.000000000 +0000 +++ vdr-plugin-dbus2vdr-20161211140556stable/.git/hooks/pre-push.sample 2016-12-11 13:05:56.000000000 +0000 @@ -24,7 +24,6 @@ z40=0000000000000000000000000000000000000000 -IFS=' ' while read local_ref local_sha remote_ref remote_sha do if [ "$local_sha" = $z40 ] @@ -45,7 +44,7 @@ commit=`git rev-list -n 1 --grep '^WIP' "$range"` if [ -n "$commit" ] then - echo "Found WIP commit in $local_ref, not pushing" + echo >&2 "Found WIP commit in $local_ref, not pushing" exit 1 fi fi diff -Nru vdr-plugin-dbus2vdr-20160311123752stable/.git/hooks/update.sample vdr-plugin-dbus2vdr-20161211140556stable/.git/hooks/update.sample --- vdr-plugin-dbus2vdr-20160311123752stable/.git/hooks/update.sample 2016-03-11 11:37:52.000000000 +0000 +++ vdr-plugin-dbus2vdr-20161211140556stable/.git/hooks/update.sample 2016-12-11 13:05:56.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh # -# An example hook script to blocks unannotated tags from entering. +# An example hook script to block unannotated tags from entering. # Called by "git receive-pack" with arguments: refname sha1-old sha1-new # # To enable this hook, rename this file to "update". Binary files /tmp/tmpN0rVpT/KyGLOZA9Fj/vdr-plugin-dbus2vdr-20160311123752stable/.git/index and /tmp/tmpN0rVpT/rQi2zq4SHP/vdr-plugin-dbus2vdr-20161211140556stable/.git/index differ diff -Nru vdr-plugin-dbus2vdr-20160311123752stable/.git/logs/HEAD vdr-plugin-dbus2vdr-20161211140556stable/.git/logs/HEAD --- vdr-plugin-dbus2vdr-20160311123752stable/.git/logs/HEAD 2016-03-11 11:37:52.000000000 +0000 +++ vdr-plugin-dbus2vdr-20161211140556stable/.git/logs/HEAD 2016-12-11 13:05:57.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 2fe1c386d2f158b32395b0749215f02fd1206769 GitHub-to-Launchpad build daemon 1457696272 +0100 clone: from git://github.com/yavdr/vdr-plugin-dbus2vdr.git +0000000000000000000000000000000000000000 299b679a719ece01894350743ba98a8b3cdfa5e6 GitHub-to-Launchpad build daemon 1481461557 +0100 clone: from git://github.com/yavdr/vdr-plugin-dbus2vdr.git diff -Nru vdr-plugin-dbus2vdr-20160311123752stable/.git/logs/refs/heads/stable-0.6 vdr-plugin-dbus2vdr-20161211140556stable/.git/logs/refs/heads/stable-0.6 --- vdr-plugin-dbus2vdr-20160311123752stable/.git/logs/refs/heads/stable-0.6 2016-03-11 11:37:52.000000000 +0000 +++ vdr-plugin-dbus2vdr-20161211140556stable/.git/logs/refs/heads/stable-0.6 2016-12-11 13:05:57.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 2fe1c386d2f158b32395b0749215f02fd1206769 GitHub-to-Launchpad build daemon 1457696272 +0100 clone: from git://github.com/yavdr/vdr-plugin-dbus2vdr.git +0000000000000000000000000000000000000000 299b679a719ece01894350743ba98a8b3cdfa5e6 GitHub-to-Launchpad build daemon 1481461557 +0100 clone: from git://github.com/yavdr/vdr-plugin-dbus2vdr.git Binary files /tmp/tmpN0rVpT/KyGLOZA9Fj/vdr-plugin-dbus2vdr-20160311123752stable/.git/objects/pack/pack-24056c8859fbee8db2c02706745032afc8e4ea43.idx and /tmp/tmpN0rVpT/rQi2zq4SHP/vdr-plugin-dbus2vdr-20161211140556stable/.git/objects/pack/pack-24056c8859fbee8db2c02706745032afc8e4ea43.idx differ Binary files /tmp/tmpN0rVpT/KyGLOZA9Fj/vdr-plugin-dbus2vdr-20160311123752stable/.git/objects/pack/pack-24056c8859fbee8db2c02706745032afc8e4ea43.pack and /tmp/tmpN0rVpT/rQi2zq4SHP/vdr-plugin-dbus2vdr-20161211140556stable/.git/objects/pack/pack-24056c8859fbee8db2c02706745032afc8e4ea43.pack differ Binary files /tmp/tmpN0rVpT/KyGLOZA9Fj/vdr-plugin-dbus2vdr-20160311123752stable/.git/objects/pack/pack-564e8c62e66f5320bebd50d5583a073a21882c44.idx and /tmp/tmpN0rVpT/rQi2zq4SHP/vdr-plugin-dbus2vdr-20161211140556stable/.git/objects/pack/pack-564e8c62e66f5320bebd50d5583a073a21882c44.idx differ Binary files /tmp/tmpN0rVpT/KyGLOZA9Fj/vdr-plugin-dbus2vdr-20160311123752stable/.git/objects/pack/pack-564e8c62e66f5320bebd50d5583a073a21882c44.pack and /tmp/tmpN0rVpT/rQi2zq4SHP/vdr-plugin-dbus2vdr-20161211140556stable/.git/objects/pack/pack-564e8c62e66f5320bebd50d5583a073a21882c44.pack differ diff -Nru vdr-plugin-dbus2vdr-20160311123752stable/.git/packed-refs vdr-plugin-dbus2vdr-20161211140556stable/.git/packed-refs --- vdr-plugin-dbus2vdr-20160311123752stable/.git/packed-refs 2016-03-11 11:37:52.000000000 +0000 +++ vdr-plugin-dbus2vdr-20161211140556stable/.git/packed-refs 2016-12-11 13:05:57.000000000 +0000 @@ -1,2 +1,2 @@ # pack-refs with: peeled fully-peeled -2fe1c386d2f158b32395b0749215f02fd1206769 refs/remotes/origin/stable-0.6 +299b679a719ece01894350743ba98a8b3cdfa5e6 refs/remotes/origin/stable-0.6 diff -Nru vdr-plugin-dbus2vdr-20160311123752stable/.git/refs/heads/stable-0.6 vdr-plugin-dbus2vdr-20161211140556stable/.git/refs/heads/stable-0.6 --- vdr-plugin-dbus2vdr-20160311123752stable/.git/refs/heads/stable-0.6 2016-03-11 11:37:52.000000000 +0000 +++ vdr-plugin-dbus2vdr-20161211140556stable/.git/refs/heads/stable-0.6 2016-12-11 13:05:57.000000000 +0000 @@ -1 +1 @@ -2fe1c386d2f158b32395b0749215f02fd1206769 +299b679a719ece01894350743ba98a8b3cdfa5e6 diff -Nru vdr-plugin-dbus2vdr-20160311123752stable/.git/shallow vdr-plugin-dbus2vdr-20161211140556stable/.git/shallow --- vdr-plugin-dbus2vdr-20160311123752stable/.git/shallow 2016-03-11 11:37:52.000000000 +0000 +++ vdr-plugin-dbus2vdr-20161211140556stable/.git/shallow 2016-12-11 13:05:56.000000000 +0000 @@ -1 +1 @@ -2fe1c386d2f158b32395b0749215f02fd1206769 +299b679a719ece01894350743ba98a8b3cdfa5e6 diff -Nru vdr-plugin-dbus2vdr-20160311123752stable/helper.c vdr-plugin-dbus2vdr-20161211140556stable/helper.c --- vdr-plugin-dbus2vdr-20160311123752stable/helper.c 2016-03-11 11:37:52.000000000 +0000 +++ vdr-plugin-dbus2vdr-20161211140556stable/helper.c 2016-12-11 13:05:57.000000000 +0000 @@ -64,6 +64,22 @@ } } +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)")); diff -Nru vdr-plugin-dbus2vdr-20160311123752stable/helper.h vdr-plugin-dbus2vdr-20161211140556stable/helper.h --- vdr-plugin-dbus2vdr-20160311123752stable/helper.h 2016-03-11 11:37:52.000000000 +0000 +++ vdr-plugin-dbus2vdr-20161211140556stable/helper.h 2016-12-11 13:05:57.000000000 +0000 @@ -16,6 +16,7 @@ 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); }; diff -Nru vdr-plugin-dbus2vdr-20160311123752stable/HISTORY vdr-plugin-dbus2vdr-20161211140556stable/HISTORY --- vdr-plugin-dbus2vdr-20160311123752stable/HISTORY 2016-03-11 11:37:52.000000000 +0000 +++ vdr-plugin-dbus2vdr-20161211140556stable/HISTORY 2016-12-11 13:05:57.000000000 +0000 @@ -245,3 +245,6 @@ 2016-03-09: Version 30 - add timer.ListDetailed + +2016-12-11: Version 31 +- correct output of "frames per second" diff -Nru vdr-plugin-dbus2vdr-20160311123752stable/recording.c vdr-plugin-dbus2vdr-20161211140556stable/recording.c --- vdr-plugin-dbus2vdr-20160311123752stable/recording.c 2016-03-11 11:37:52.000000000 +0000 +++ vdr-plugin-dbus2vdr-20161211140556stable/recording.c 2016-12-11 13:05:57.000000000 +0000 @@ -33,7 +33,6 @@ gboolean b; guint64 tu64; int i; - gdouble d; c = recording->FileName(); if (c != NULL) @@ -62,8 +61,7 @@ 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 @@ 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++) {