summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/libcamera/controls.h6
-rw-r--r--include/libcamera/request.h7
2 files changed, 7 insertions, 6 deletions
diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h
index d3eea643..90426753 100644
--- a/include/libcamera/controls.h
+++ b/include/libcamera/controls.h
@@ -13,7 +13,7 @@
namespace libcamera {
-class Camera;
+class ControlValidator;
enum ControlType {
ControlTypeNone,
@@ -119,7 +119,7 @@ private:
using ControlListMap = std::unordered_map<const ControlId *, ControlValue>;
public:
- ControlList(Camera *camera);
+ ControlList(ControlValidator *validator);
using iterator = ControlListMap::iterator;
using const_iterator = ControlListMap::const_iterator;
@@ -160,7 +160,7 @@ private:
const ControlValue *find(const ControlId &id) const;
ControlValue *find(const ControlId &id);
- Camera *camera_;
+ ControlValidator *validator_;
ControlListMap controls_;
};
diff --git a/include/libcamera/request.h b/include/libcamera/request.h
index 9edf1ced..e3db5243 100644
--- a/include/libcamera/request.h
+++ b/include/libcamera/request.h
@@ -19,9 +19,9 @@ namespace libcamera {
class Buffer;
class Camera;
+class CameraControlValidator;
class Stream;
-
class Request
{
public:
@@ -36,7 +36,7 @@ public:
Request &operator=(const Request &) = delete;
~Request();
- ControlList &controls() { return controls_; }
+ ControlList &controls() { return *controls_; }
const std::map<Stream *, Buffer *> &buffers() const { return bufferMap_; }
int addBuffer(std::unique_ptr<Buffer> buffer);
Buffer *findBuffer(Stream *stream) const;
@@ -56,7 +56,8 @@ private:
bool completeBuffer(Buffer *buffer);
Camera *camera_;
- ControlList controls_;
+ CameraControlValidator *validator_;
+ ControlList *controls_;
std::map<Stream *, Buffer *> bufferMap_;
std::unordered_set<Buffer *> pending_;