diff --git a/daemon/src/video/v4l2/video_device_monitor.cpp b/daemon/src/video/v4l2/video_device_monitor.cpp index 4e3524cd14abfbc10c967895a8094e820b90d3d8..f490e777c4a2163678c7ca1ea80eb4b9d9b767da 100644 --- a/daemon/src/video/v4l2/video_device_monitor.cpp +++ b/daemon/src/video/v4l2/video_device_monitor.cpp @@ -424,27 +424,21 @@ VideoDeviceMonitor::getDeviceList() const return monitorImpl_->getDeviceList(); } -std::vector<std::string> -VideoDeviceMonitor::getChannelList(const std::string &dev) const -{ - return monitorImpl_->getChannelList(dev); -} +/* + * Interface for a single device. + */ -std::vector<std::string> -VideoDeviceMonitor::getSizeList(const std::string &dev, const std::string &channel) const +VideoCapabilities +VideoDeviceMonitor::getCapabilities(const std::string& name) const { - return monitorImpl_->getSizeList(dev, channel); -} + VideoCapabilities cap; -std::vector<std::string> -VideoDeviceMonitor::getRateList(const std::string &dev, const std::string &channel, const std::string &size) const -{ - return monitorImpl_->getRateList(dev, channel, size); -} + for (const auto& chan : monitorImpl_->getChannelList(name)) + for (const auto& size : monitorImpl_->getSizeList(name, chan)) + cap[chan][size] = monitorImpl_->getRateList(name, chan, size); -/* - * Interface for a single device. - */ + return cap; +} std::map<std::string, std::string> VideoDeviceMonitor::deviceToSettings(const VideoDevice& dev) const diff --git a/daemon/src/video/video_device_monitor.cpp b/daemon/src/video/video_device_monitor.cpp index cef448048cf557818756b1f4bf084e17594ffec0..24fb237203bfc5cfcb4d772f2d1f210c4163ed41 100644 --- a/daemon/src/video/video_device_monitor.cpp +++ b/daemon/src/video/video_device_monitor.cpp @@ -44,18 +44,6 @@ using namespace sfl_video; * Interface for a single device. */ -VideoCapabilities -VideoDeviceMonitor::getCapabilities(const std::string& name) const -{ - VideoCapabilities cap; - - for (const auto& chan : getChannelList(name)) - for (const auto& size : getSizeList(name, chan)) - cap[chan][size] = getRateList(name, chan, size); - - return cap; -} - VideoDeviceMonitor::VideoDevice VideoDeviceMonitor::defaultPreferences(const std::string& name) const { diff --git a/daemon/src/video/video_device_monitor.h b/daemon/src/video/video_device_monitor.h index 6b488d650f294bc9dcd2379b5c22c8d3f3c984bf..176b36de5695daeb46ddf1d8b0168efddc295ad6 100644 --- a/daemon/src/video/video_device_monitor.h +++ b/daemon/src/video/video_device_monitor.h @@ -106,10 +106,6 @@ class VideoDeviceMonitor : public Serializable std::vector<VideoDevice>::iterator lookupDevice(const std::string& name); std::vector<VideoDevice>::const_iterator lookupDevice(const std::string& name) const; - std::vector<std::string> getChannelList(const std::string& name) const; - std::vector<std::string> getSizeList(const std::string& name, const std::string& channel) const; - std::vector<std::string> getRateList(const std::string& name, const std::string& channel, const std::string& size) const; - bool validatePreference(const VideoDevice& dev) const; std::map<std::string, std::string> deviceToSettings(const VideoDevice& dev) const; static void addDeviceToSequence(const VideoDevice& dev, Conf::SequenceNode& seq);