From b2efc99dc63cb88315064756fed3474d93101856 Mon Sep 17 00:00:00 2001
From: Yang Wang <yang.wang@savoirfairelinux.com>
Date: Mon, 2 Dec 2019 11:27:06 -0500
Subject: [PATCH] avmodel: expose useAVframe, currentAVFrame on non-DBus
platforms
Change-Id: Ia2714fb137b41566c653dbb1ec18e7b65e325084
---
src/api/newvideo.h | 2 +-
src/newvideo.cpp | 2 +-
src/video/renderer.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/api/newvideo.h b/src/api/newvideo.h
index 2d6bb82d..1e91c21c 100644
--- a/src/api/newvideo.h
+++ b/src/api/newvideo.h
@@ -136,7 +136,7 @@ public:
*/
Frame currentFrame() const;
-#if defined(ENABLE_LIBWRAP) || (defined __APPLE__)
+#if defined(ENABLE_LIBWRAP)
/**
* @return current avframe
*/
diff --git a/src/newvideo.cpp b/src/newvideo.cpp
index 20419ad7..2c7deef9 100644
--- a/src/newvideo.cpp
+++ b/src/newvideo.cpp
@@ -163,7 +163,7 @@ Renderer::currentFrame() const
return result;
}
-#if defined(ENABLE_LIBWRAP) || (defined __APPLE__)
+#if defined(ENABLE_LIBWRAP)
std::unique_ptr<AVFrame, void(*)(AVFrame*)>
Renderer::currentAVFrame() const
{
diff --git a/src/video/renderer.h b/src/video/renderer.h
index c7f8384c..1cbf6d49 100644
--- a/src/video/renderer.h
+++ b/src/video/renderer.h
@@ -98,7 +98,7 @@ public:
virtual QSize size () const;
virtual QMutex* mutex () const;
virtual ColorSpace colorSpace () const = 0;
-#if defined(ENABLE_LIBWRAP) || (defined __APPLE__)
+#if defined(ENABLE_LIBWRAP)
virtual std::unique_ptr<AVFrame, void(*)(AVFrame*)> currentAVFrame() const = 0;
#endif
void setSize(const QSize& size) const;
--
GitLab