summaryrefslogtreecommitdiff
path: root/include/libcamera/internal/media_device.h
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-05-26 06:03:18 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-06-02 19:26:22 +0300
commite239ded90bb820b8dfbe0725b1d5f965a9212299 (patch)
tree1b2f012ba5897368d4bc266585dc0a473301e870 /include/libcamera/internal/media_device.h
parent16c5f44c690a1d7d31b2e150d6e916cc6a999119 (diff)
libcamera: Declare functions before variables in class definitions
The preferred coding style in libcamera is to declare private functions before private variables in class definitions. This rule isn't followed by some of the internal classes. Update them accordingly. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Umang Jain <email@uajain.com>
Diffstat (limited to 'include/libcamera/internal/media_device.h')
-rw-r--r--include/libcamera/internal/media_device.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/include/libcamera/internal/media_device.h b/include/libcamera/internal/media_device.h
index 9fe76c51..19af059d 100644
--- a/include/libcamera/internal/media_device.h
+++ b/include/libcamera/internal/media_device.h
@@ -58,26 +58,13 @@ protected:
std::string logPrefix() const;
private:
- std::string driver_;
- std::string deviceNode_;
- std::string model_;
- unsigned int version_;
-
- int fd_;
- bool valid_;
- bool acquired_;
- bool lockOwner_;
-
int open();
void close();
- std::map<unsigned int, MediaObject *> objects_;
MediaObject *object(unsigned int id);
bool addObject(MediaObject *object);
void clear();
- std::vector<MediaEntity *> entities_;
-
struct media_v2_interface *findInterface(const struct media_v2_topology &topology,
unsigned int entityId);
bool populateEntities(const struct media_v2_topology &topology);
@@ -87,6 +74,19 @@ private:
friend int MediaLink::setEnabled(bool enable);
int setupLink(const MediaLink *link, unsigned int flags);
+
+ std::string driver_;
+ std::string deviceNode_;
+ std::string model_;
+ unsigned int version_;
+
+ int fd_;
+ bool valid_;
+ bool acquired_;
+ bool lockOwner_;
+
+ std::map<unsigned int, MediaObject *> objects_;
+ std::vector<MediaEntity *> entities_;
};
} /* namespace libcamera */