diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-10-23 07:46:33 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-10-23 22:48:08 +0300 |
| commit | ef10997b4af5174d7f83b6678c2e4cd13b39a851 (patch) | |
| tree | f94fa821c2a4a7c6a61416bf34244c25ab95dcf1 | |
| parent | d0e665c3eda56977ca8529ae698400ce0e65fac6 (diff) | |
libcamera: media_object: Remove unneeded destructors
The MediaEntity, MediaLink and MediaPad classes don't need custom
destructors. For MediaEntity and MediaPad, the destructors clear a
vector embedded in the classes, which will be done by the default
destructor. For MediaLink, the destructor is already empty. Remove them.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Umang Jain <email@uajain.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
| -rw-r--r-- | include/libcamera/internal/media_object.h | 3 | ||||
| -rw-r--r-- | src/libcamera/media_object.cpp | 18 |
2 files changed, 0 insertions, 21 deletions
diff --git a/include/libcamera/internal/media_object.h b/include/libcamera/internal/media_object.h index be6fb896..54311c14 100644 --- a/include/libcamera/internal/media_object.h +++ b/include/libcamera/internal/media_object.h @@ -51,7 +51,6 @@ private: MediaLink(const struct media_v2_link *link, MediaPad *source, MediaPad *sink); MediaLink(const MediaLink &) = delete; - ~MediaLink() {} MediaPad *source_; MediaPad *sink_; @@ -73,7 +72,6 @@ private: MediaPad(const struct media_v2_pad *pad, MediaEntity *entity); MediaPad(const MediaPad &) = delete; - ~MediaPad(); unsigned int index_; MediaEntity *entity_; @@ -105,7 +103,6 @@ private: MediaEntity(MediaDevice *dev, const struct media_v2_entity *entity, unsigned int major = 0, unsigned int minor = 0); MediaEntity(const MediaEntity &) = delete; - ~MediaEntity(); void addPad(MediaPad *pad); diff --git a/src/libcamera/media_object.cpp b/src/libcamera/media_object.cpp index b7bf048c..05603663 100644 --- a/src/libcamera/media_object.cpp +++ b/src/libcamera/media_object.cpp @@ -191,15 +191,6 @@ MediaPad::MediaPad(const struct media_v2_pad *pad, MediaEntity *entity) { } -MediaPad::~MediaPad() -{ - /* - * Don't delete the links as we only borrow the reference owned by - * MediaDevice. - */ - links_.clear(); -} - /** * \fn MediaPad::index() * \brief Retrieve the pad index @@ -371,15 +362,6 @@ MediaEntity::MediaEntity(MediaDevice *dev, { } -MediaEntity::~MediaEntity() -{ - /* - * Don't delete the pads as we only borrow the reference owned by - * MediaDevice. - */ - pads_.clear(); -} - /** * \brief Add \a pad to the entity's list of pads * \param[in] pad The pad to add to the list |