diff --git a/daemon/src/client/dbus/videomanager-introspec.xml b/daemon/src/client/dbus/videomanager-introspec.xml index 05b02f2c92c13d7e61be59994ea7da79e3edf085..317592df60194bb82b76ea5eff056ef976fbe7f4 100644 --- a/daemon/src/client/dbus/videomanager-introspec.xml +++ b/daemon/src/client/dbus/videomanager-introspec.xml @@ -10,39 +10,6 @@ </arg> </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"> <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"/> diff --git a/daemon/src/client/videomanager.cpp b/daemon/src/client/videomanager.cpp index 66802ded51fb4205221bba21bbac1175cdbc5e28..9440c7c2ae002096db1d190385b32667c88c5b19 100644 --- a/daemon/src/client/videomanager.cpp +++ b/daemon/src/client/videomanager.cpp @@ -72,24 +72,6 @@ VideoManager::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 VideoManager::getCapabilities(const std::string& name) { diff --git a/daemon/src/client/videomanager.h b/daemon/src/client/videomanager.h index 5690566e16cf750b470023cf41de4479c2668f38..1ce0c590a78e6c1ea1419bd245f30df332d0ec35 100644 --- a/daemon/src/client/videomanager.h +++ b/daemon/src/client/videomanager.h @@ -98,15 +98,6 @@ class VideoManager std::vector<std::string> 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 getCapabilities(const std::string& name);