diff --git a/bin/dbus/cx.ring.Ring.VideoManager.xml b/bin/dbus/cx.ring.Ring.VideoManager.xml index bb24dab4dc77b14ff998936cf05244b4830df5b3..fef89486d02f9a032ce4d0dda8ee8b9835ad0e8c 100644 --- a/bin/dbus/cx.ring.Ring.VideoManager.xml +++ b/bin/dbus/cx.ring.Ring.VideoManager.xml @@ -78,6 +78,20 @@ </arg> </method> + <method name="getDecodingAccelerated" tp:name-for-bindings="getDecodingAccelerated"> + <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="Bool"/> + <arg type="b" name="state" direction="out"> + <tp:docstring>Returns true if hardware decoding is enabled, false otherwise</tp:docstring> + </arg> + </method> + + <method name="setDecodingAccelerated" tp:name-for-bindings="setDecodingAccelerated"> + <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="Bool"/> + <arg type="b" name="state" direction="in"> + <tp:docstring>Toggle hardware decoding</tp:docstring> + </arg> + </method> + <signal name="deviceEvent" tp:name-for-bindings="deviceEvent"> <tp:docstring>Signal triggered by changes in the detected v4l2 devices, e.g. a camera being unplugged.</tp:docstring> </signal> @@ -113,6 +127,5 @@ <tp:docstring>Whether or not this texture belongs to a video mixer or is a single texture</tp:docstring> </arg> </signal> - </interface> </node> diff --git a/bin/dbus/dbusvideomanager.cpp b/bin/dbus/dbusvideomanager.cpp index 5c968eb2f8d8b319cdb0e8364f391497872682f3..aea37d92d450e9192a16266a663815f25337daf7 100644 --- a/bin/dbus/dbusvideomanager.cpp +++ b/bin/dbus/dbusvideomanager.cpp @@ -85,14 +85,14 @@ DBusVideoManager::hasCameraStarted() -> decltype(DRing::hasCameraStarted()) return DRing::hasCameraStarted(); } -bool -DBusVideoManager::getDecodingAccelerated() +auto +DBusVideoManager::getDecodingAccelerated() -> decltype(DRing::getDecodingAccelerated()) { return DRing::getDecodingAccelerated(); } void -DBusVideoManager::setDecodingAccelerated(bool state) +DBusVideoManager::setDecodingAccelerated(const bool& state) { DRing::setDecodingAccelerated(state); } diff --git a/bin/dbus/dbusvideomanager.h b/bin/dbus/dbusvideomanager.h index 119c172dc3094dac43b240a5c50ab95bc64c1a09..a20452b246da6cc03c4fee83ca8b6e9893ac0bf7 100644 --- a/bin/dbus/dbusvideomanager.h +++ b/bin/dbus/dbusvideomanager.h @@ -61,7 +61,7 @@ class DBusVideoManager : bool switchInput(const std::string& resource); bool hasCameraStarted(); bool getDecodingAccelerated(); - void setDecodingAccelerated(bool state); + void setDecodingAccelerated(const bool& state); }; #endif // __RING_DBUSVIDEOMANAGER_H__