diff --git a/bin/dbus/cx.ring.Ring.VideoManager.xml b/bin/dbus/cx.ring.Ring.VideoManager.xml index 7ddc8442aee1fdfdcd32a607c467c7b1bc85b234..fac32e447cfdf30d8bb5c6d97b42cd1c4f31be14 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 374ab265cb39760e2917259f2d62d76d02f20fe4..5c5fbed1bfa3df91dcad431184614d683d87d339 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 f1ff369c2601c5ca44fe76633b720fc5f7e03e3b..5956dc3971d777b49b683f9c9fc4210ad01b80d1 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