Skip to content
Snippets Groups Projects
Commit 2cdc662a authored by Philippe Gorley's avatar Philippe Gorley
Browse files

dbus: correctly expose hardware acceleration

Hardware acceleration was not correctly exposed through the dbus
interfaces

Change-Id: I93dcf14f2a19a6ce768b8ac9799e5f96a8eaa44d
parent cae71152
No related branches found
No related tags found
No related merge requests found
...@@ -78,6 +78,20 @@ ...@@ -78,6 +78,20 @@
</arg> </arg>
</method> </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"> <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> <tp:docstring>Signal triggered by changes in the detected v4l2 devices, e.g. a camera being unplugged.</tp:docstring>
</signal> </signal>
...@@ -113,6 +127,5 @@ ...@@ -113,6 +127,5 @@
<tp:docstring>Whether or not this texture belongs to a video mixer or is a single texture</tp:docstring> <tp:docstring>Whether or not this texture belongs to a video mixer or is a single texture</tp:docstring>
</arg> </arg>
</signal> </signal>
</interface> </interface>
</node> </node>
...@@ -85,14 +85,14 @@ DBusVideoManager::hasCameraStarted() -> decltype(DRing::hasCameraStarted()) ...@@ -85,14 +85,14 @@ DBusVideoManager::hasCameraStarted() -> decltype(DRing::hasCameraStarted())
return DRing::hasCameraStarted(); return DRing::hasCameraStarted();
} }
bool auto
DBusVideoManager::getDecodingAccelerated() DBusVideoManager::getDecodingAccelerated() -> decltype(DRing::getDecodingAccelerated())
{ {
return DRing::getDecodingAccelerated(); return DRing::getDecodingAccelerated();
} }
void void
DBusVideoManager::setDecodingAccelerated(bool state) DBusVideoManager::setDecodingAccelerated(const bool& state)
{ {
DRing::setDecodingAccelerated(state); DRing::setDecodingAccelerated(state);
} }
...@@ -61,7 +61,7 @@ class DBusVideoManager : ...@@ -61,7 +61,7 @@ class DBusVideoManager :
bool switchInput(const std::string& resource); bool switchInput(const std::string& resource);
bool hasCameraStarted(); bool hasCameraStarted();
bool getDecodingAccelerated(); bool getDecodingAccelerated();
void setDecodingAccelerated(bool state); void setDecodingAccelerated(const bool& state);
}; };
#endif // __RING_DBUSVIDEOMANAGER_H__ #endif // __RING_DBUSVIDEOMANAGER_H__
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment