From 3a2b9dbe2121d65b04c1211d62bc8715cf8cef91 Mon Sep 17 00:00:00 2001
From: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Date: Mon, 9 Jun 2014 12:33:40 -0400
Subject: [PATCH] video_preferences: make list getters private
This commit makes the getters for the channel, size and rate lists
private.
Refs #48203
Change-Id: Ic5c6b8bf10ac340fc3297fc54674404de78095a8
---
daemon/src/video/video_preferences.h | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/daemon/src/video/video_preferences.h b/daemon/src/video/video_preferences.h
index 261ed3999a..5942d86fb0 100644
--- a/daemon/src/video/video_preferences.h
+++ b/daemon/src/video/video_preferences.h
@@ -59,9 +59,6 @@ class VideoPreference : public Serializable
* Video device monitoring specific interface.
*/
std::vector<std::string> getDeviceList() 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;
VideoCapabilities
getCapabilities(const std::string& name);
@@ -110,6 +107,10 @@ class VideoPreference : 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);
--
GitLab