From 2cc4c967d2dae6adf70512d88ce20d3a989391ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Fri, 12 Jul 2019 10:49:37 -0400
Subject: [PATCH] video: only define currentAVFrame if needed
Change-Id: I85652e59a39097303fbfc414b7391a34dec019a6
---
src/api/newvideo.h | 4 ++++
src/newvideo.cpp | 2 ++
src/shmrenderer.h | 1 -
src/video/renderer.h | 2 ++
4 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/api/newvideo.h b/src/api/newvideo.h
index c7d16405..0d1fcaf5 100644
--- a/src/api/newvideo.h
+++ b/src/api/newvideo.h
@@ -134,10 +134,14 @@ public:
* @return current rendered frame
*/
Frame currentFrame() const;
+
+#if defined(ENABLE_LIBWRAP) || (defined __APPLE__)
/**
* @return current avframe
*/
std::unique_ptr<AVFrame, void(*)(AVFrame*)> currentAVFrame() const;
+#endif
+
/**
* @return current size
*/
diff --git a/src/newvideo.cpp b/src/newvideo.cpp
index 016b5d03..46a288ef 100644
--- a/src/newvideo.cpp
+++ b/src/newvideo.cpp
@@ -156,11 +156,13 @@ Renderer::currentFrame() const
return result;
}
+#if defined(ENABLE_LIBWRAP) || (defined __APPLE__)
std::unique_ptr<AVFrame, void(*)(AVFrame*)>
Renderer::currentAVFrame() const
{
return pimpl_->renderer->currentAVFrame();
}
+#endif
QSize
Renderer::size() const
diff --git a/src/shmrenderer.h b/src/shmrenderer.h
index 30de4bd0..faaebe3a 100644
--- a/src/shmrenderer.h
+++ b/src/shmrenderer.h
@@ -59,7 +59,6 @@ public:
int fps() const;
virtual Frame currentFrame() const override;
virtual ColorSpace colorSpace () const override;
- virtual std::unique_ptr<AVFrame, void(*)(AVFrame*)> currentAVFrame() const override;
//Setters
void setShmPath(const QString& path);
diff --git a/src/video/renderer.h b/src/video/renderer.h
index 41b6f29f..0ec961dd 100644
--- a/src/video/renderer.h
+++ b/src/video/renderer.h
@@ -99,7 +99,9 @@ public:
virtual QSize size () const;
virtual QMutex* mutex () const;
virtual ColorSpace colorSpace () const = 0;
+#if defined(ENABLE_LIBWRAP) || (defined __APPLE__)
virtual std::unique_ptr<AVFrame, void(*)(AVFrame*)> currentAVFrame() const = 0;
+#endif
void setSize(const QSize& size) const;
Q_SIGNALS:
--
GitLab