PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: media_object: Utilise LIBCAMERA_DISABLE_COPY_AND_MOVE

Browse Source 
Convert MediaLink, MediaPad, and MediaEntity to declare
LIBCAMERA_DISABLE_COPY_AND_MOVE. These classes already deleted their
copy constructor but not the assignment operator.

They should also not be movable, so expand to fully disable both copying
and moving.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Kieran Bingham
2020-10-22 14:27:10 +01:00
parent 74f103486c
commit 234ee71517
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/libcamera/internal/media_object.h
View File

@@ -12,6 +12,8 @@
#include <linux/media.h>
#include <libcamera/class.h>
namespace libcamera {
class MediaDevice;
@@ -47,11 +49,12 @@ public:
int setEnabled(bool enable);
private:
LIBCAMERA_DISABLE_COPY_AND_MOVE(MediaLink)
friend class MediaDevice;
MediaLink(const struct media_v2_link *link,
MediaPad *source, MediaPad *sink);
MediaLink(const MediaLink &) = delete;
MediaPad *source_;
MediaPad *sink_;
@@ -69,10 +72,11 @@ public:
void addLink(MediaLink *link);
private:
LIBCAMERA_DISABLE_COPY_AND_MOVE(MediaPad)
friend class MediaDevice;
MediaPad(const struct media_v2_pad *pad, MediaEntity *entity);
MediaPad(const MediaPad &) = delete;
unsigned int index_;
MediaEntity *entity_;
@@ -99,11 +103,12 @@ public:
int setDeviceNode(const std::string &deviceNode);
private:
LIBCAMERA_DISABLE_COPY_AND_MOVE(MediaEntity)
friend class MediaDevice;
MediaEntity(MediaDevice *dev, const struct media_v2_entity *entity,
unsigned int major = 0, unsigned int minor = 0);
MediaEntity(const MediaEntity &) = delete;
void addPad(MediaPad *pad);