diff options
Diffstat (limited to 'include/libcamera/internal/media_device.h')
| -rw-r--r-- | include/libcamera/internal/media_device.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/include/libcamera/internal/media_device.h b/include/libcamera/internal/media_device.h index 3a7722c2..e412d3a0 100644 --- a/include/libcamera/internal/media_device.h +++ b/include/libcamera/internal/media_device.h @@ -2,13 +2,12 @@ /* * Copyright (C) 2018, Google Inc. * - * media_device.h - Media device handler + * Media device handler */ -#ifndef __LIBCAMERA_INTERNAL_MEDIA_DEVICE_H__ -#define __LIBCAMERA_INTERNAL_MEDIA_DEVICE_H__ + +#pragma once #include <map> -#include <sstream> #include <string> #include <vector> @@ -16,6 +15,7 @@ #include <libcamera/base/log.h> #include <libcamera/base/signal.h> +#include <libcamera/base/unique_fd.h> #include "libcamera/internal/media_object.h" @@ -37,9 +37,9 @@ public: int populate(); bool isValid() const { return valid_; } - const std::string driver() const { return driver_; } - const std::string deviceNode() const { return deviceNode_; } - const std::string model() const { return model_; } + const std::string &driver() const { return driver_; } + const std::string &deviceNode() const { return deviceNode_; } + const std::string &model() const { return model_; } unsigned int version() const { return version_; } unsigned int hwRevision() const { return hwRevision_; } @@ -53,7 +53,7 @@ public: MediaLink *link(const MediaPad *source, const MediaPad *sink); int disableLinks(); - Signal<MediaDevice *> disconnected; + Signal<> disconnected; protected: std::string logPrefix() const override; @@ -82,15 +82,12 @@ private: unsigned int version_; unsigned int hwRevision_; - int fd_; + UniqueFD fd_; bool valid_; bool acquired_; - bool lockOwner_; std::map<unsigned int, MediaObject *> objects_; std::vector<MediaEntity *> entities_; }; } /* namespace libcamera */ - -#endif /* __LIBCAMERA_INTERNAL_MEDIA_DEVICE_H__ */ |