From e239ded90bb820b8dfbe0725b1d5f965a9212299 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 26 May 2020 06:03:18 +0300 Subject: 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 Reviewed-by: Umang Jain --- include/libcamera/internal/media_device.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'include/libcamera/internal/media_device.h') 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 objects_; MediaObject *object(unsigned int id); bool addObject(MediaObject *object); void clear(); - std::vector 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 objects_; + std::vector entities_; }; } /* namespace libcamera */ -- cgit v1.2.1