Skip to content
Snippets Groups Projects
Commit f26f20d5 authored by Andreas Traczyk's avatar Andreas Traczyk
Browse files

video interface: homogenize decoding signal names

Change-Id: Ica925c83e44e2326417708768566e33102365ce9
parent 775aa2f8
No related branches found
No related tags found
No related merge requests found
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
<tp:docstring>Signal triggered by changes in the detected v4l2 devices, e.g. a camera being unplugged.</tp:docstring> <tp:docstring>Signal triggered by changes in the detected v4l2 devices, e.g. a camera being unplugged.</tp:docstring>
</signal> </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> <tp:docstring>Signal triggered when video is available in a shared memory buffer.</tp:docstring>
<arg type="s" name="id"> <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> <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 @@ ...@@ -183,7 +183,7 @@
</arg> </arg>
</signal> </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> <tp:docstring>Signal triggered when video is no longer available in a shared memory buffer.</tp:docstring>
<arg type="s" name="id"> <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> <tp:docstring>The ID of the call associated with the video, or "local" in the case of local video</tp:docstring>
......
...@@ -316,9 +316,9 @@ DBusClient::initLibrary(int flags) ...@@ -316,9 +316,9 @@ DBusClient::initLibrary(int flags)
const std::map<std::string, SharedCallback> videoEvHandlers = { const std::map<std::string, SharedCallback> videoEvHandlers = {
exportable_callback<VideoSignal::DeviceEvent>(bind(&DBusVideoManager::deviceEvent, videoM)), exportable_callback<VideoSignal::DeviceEvent>(bind(&DBusVideoManager::deviceEvent, videoM)),
exportable_callback<VideoSignal::DecodingStarted>( 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>( exportable_callback<VideoSignal::DecodingStopped>(
bind(&DBusVideoManager::stoppedDecoding, videoM, _1, _2, _3)), bind(&DBusVideoManager::decodingStopped, videoM, _1, _2, _3)),
}; };
#endif #endif
......
...@@ -2,7 +2,7 @@ dnl Jami - configure.ac ...@@ -2,7 +2,7 @@ dnl Jami - configure.ac
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69]) 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 Clear the implicit flags that default to '-g -O2', otherwise they
dnl take precedence over the values we set via the dnl take precedence over the values we set via the
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment