From f26f20d567c84687992eb4f38f06385ab70df163 Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Thu, 24 Feb 2022 15:48:36 -0500
Subject: [PATCH] video interface: homogenize decoding signal names
Change-Id: Ica925c83e44e2326417708768566e33102365ce9
---
bin/dbus/cx.ring.Ring.VideoManager.xml | 4 ++--
bin/dbus/dbusclient.cpp | 4 ++--
configure.ac | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/bin/dbus/cx.ring.Ring.VideoManager.xml b/bin/dbus/cx.ring.Ring.VideoManager.xml
index 7ddc8442ae..fac32e447c 100644
--- a/bin/dbus/cx.ring.Ring.VideoManager.xml
+++ b/bin/dbus/cx.ring.Ring.VideoManager.xml
@@ -164,7 +164,7 @@
<tp:docstring>Signal triggered by changes in the detected v4l2 devices, e.g. a camera being unplugged.</tp:docstring>
</signal>
- <signal name="startedDecoding" tp:name-for-bindings="startedDecoding">
+ <signal name="decodingStarted" tp:name-for-bindings="decodingStarted">
<tp:docstring>Signal triggered when video is available in a shared memory buffer.</tp:docstring>
<arg type="s" name="id">
<tp:docstring>The ID of the call associated with the video, or "local" in the case of local video</tp:docstring>
@@ -183,7 +183,7 @@
</arg>
</signal>
- <signal name="stoppedDecoding" tp:name-for-bindings="stoppedDecoding">
+ <signal name="decodingStopped" tp:name-for-bindings="decodingStopped">
<tp:docstring>Signal triggered when video is no longer available in a shared memory buffer.</tp:docstring>
<arg type="s" name="id">
<tp:docstring>The ID of the call associated with the video, or "local" in the case of local video</tp:docstring>
diff --git a/bin/dbus/dbusclient.cpp b/bin/dbus/dbusclient.cpp
index 374ab265cb..5c5fbed1bf 100644
--- a/bin/dbus/dbusclient.cpp
+++ b/bin/dbus/dbusclient.cpp
@@ -316,9 +316,9 @@ DBusClient::initLibrary(int flags)
const std::map<std::string, SharedCallback> videoEvHandlers = {
exportable_callback<VideoSignal::DeviceEvent>(bind(&DBusVideoManager::deviceEvent, videoM)),
exportable_callback<VideoSignal::DecodingStarted>(
- bind(&DBusVideoManager::startedDecoding, videoM, _1, _2, _3, _4, _5)),
+ bind(&DBusVideoManager::decodingStarted, videoM, _1, _2, _3, _4, _5)),
exportable_callback<VideoSignal::DecodingStopped>(
- bind(&DBusVideoManager::stoppedDecoding, videoM, _1, _2, _3)),
+ bind(&DBusVideoManager::decodingStopped, videoM, _1, _2, _3)),
};
#endif
diff --git a/configure.ac b/configure.ac
index f1ff369c26..5956dc3971 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Jami - configure.ac
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([Jami Daemon],[11.0.2],[jami@gnu.org],[jami])
+AC_INIT([Jami Daemon],[12.0.0],[jami@gnu.org],[jami])
dnl Clear the implicit flags that default to '-g -O2', otherwise they
dnl take precedence over the values we set via the
--
GitLab