Skip to content
Snippets Groups Projects
Commit b05a29e3 authored by Vivien Didelot's avatar Vivien Didelot
Browse files

client: remove device lists getters and setters

This commit removes the getters and setters for the channel, size and
rate lists from the videomanager, as they are deprecated with the new
getCapabilities() method.

Refs #48203
Change-Id: I3e5ffcf59fca0b10da36d77b791db758958c73e8
parent 8c017924
Branches
No related tags found
No related merge requests found
...@@ -10,39 +10,6 @@ ...@@ -10,39 +10,6 @@
</arg> </arg>
</method> </method>
<method name="getDeviceChannelList" tp:name-for-bindings="getDeviceChannelList">
<tp:docstring>Returns a list of the channels available for a given v4l2 device</tp:docstring>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="s" name="device" direction="in">
</arg>
<arg type="as" name="list" direction="out">
</arg>
</method>
<method name="getDeviceSizeList" tp:name-for-bindings="getDeviceSizeList">
<tp:docstring>Returns a list of the resolutions available for a given channel of a given v4l2 device</tp:docstring>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="s" name="device" direction="in">
</arg>
<arg type="s" name="channel" direction="in">
</arg>
<arg type="as" name="list" direction="out">
</arg>
</method>
<method name="getDeviceRateList" tp:name-for-bindings="getDeviceRateList">
<tp:docstring>Returns a list of the framerates available for a given resolution of a given channel of a given v4l2 device</tp:docstring>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="s" name="device" direction="in">
</arg>
<arg type="s" name="channel" direction="in">
</arg>
<arg type="s" name="size" direction="in">
</arg>
<arg type="as" name="list" direction="out">
</arg>
</method>
<method name="getCapabilities" tp:name-for-bindings="getCapabilities"> <method name="getCapabilities" tp:name-for-bindings="getCapabilities">
<tp:docstring>Returns a map of map of array of strings, containing the capabilities (channel, size, rate) of a device</tp:docstring> <tp:docstring>Returns a map of map of array of strings, containing the capabilities (channel, size, rate) of a device</tp:docstring>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringMapStringVectorString"/> <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringMapStringVectorString"/>
......
...@@ -72,24 +72,6 @@ VideoManager::getDeviceList() ...@@ -72,24 +72,6 @@ VideoManager::getDeviceList()
return videoPreference_.getDeviceList(); return videoPreference_.getDeviceList();
} }
std::vector<std::string>
VideoManager::getDeviceChannelList(const std::string &dev)
{
return videoPreference_.getChannelList(dev);
}
std::vector<std::string>
VideoManager::getDeviceSizeList(const std::string &dev, const std::string &channel)
{
return videoPreference_.getSizeList(dev, channel);
}
std::vector<std::string>
VideoManager::getDeviceRateList(const std::string &dev, const std::string &channel, const std::string &size)
{
return videoPreference_.getRateList(dev, channel, size);
}
VideoCapabilities VideoCapabilities
VideoManager::getCapabilities(const std::string& name) VideoManager::getCapabilities(const std::string& name)
{ {
......
...@@ -98,15 +98,6 @@ class VideoManager ...@@ -98,15 +98,6 @@ class VideoManager
std::vector<std::string> std::vector<std::string>
getDeviceList(); getDeviceList();
std::vector<std::string>
getDeviceChannelList(const std::string &dev);
std::vector<std::string>
getDeviceSizeList(const std::string &dev, const std::string &channel);
std::vector<std::string>
getDeviceRateList(const std::string &dev, const std::string &channel, const std::string &size);
VideoCapabilities VideoCapabilities
getCapabilities(const std::string& name); getCapabilities(const std::string& name);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment