Commit b2efc99d authored by Yang Wang's avatar Yang Wang Committed by Andreas Traczyk

avmodel: expose useAVframe, currentAVFrame on non-DBus platforms

Change-Id: Ia2714fb137b41566c653dbb1ec18e7b65e325084
parent 9033db9d
...@@ -136,7 +136,7 @@ public: ...@@ -136,7 +136,7 @@ public:
*/ */
Frame currentFrame() const; Frame currentFrame() const;
#if defined(ENABLE_LIBWRAP) || (defined __APPLE__) #if defined(ENABLE_LIBWRAP)
/** /**
* @return current avframe * @return current avframe
*/ */
......
...@@ -163,7 +163,7 @@ Renderer::currentFrame() const ...@@ -163,7 +163,7 @@ Renderer::currentFrame() const
return result; return result;
} }
#if defined(ENABLE_LIBWRAP) || (defined __APPLE__) #if defined(ENABLE_LIBWRAP)
std::unique_ptr<AVFrame, void(*)(AVFrame*)> std::unique_ptr<AVFrame, void(*)(AVFrame*)>
Renderer::currentAVFrame() const Renderer::currentAVFrame() const
{ {
......
...@@ -98,7 +98,7 @@ public: ...@@ -98,7 +98,7 @@ public:
virtual QSize size () const; virtual QSize size () const;
virtual QMutex* mutex () const; virtual QMutex* mutex () const;
virtual ColorSpace colorSpace () const = 0; 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; virtual std::unique_ptr<AVFrame, void(*)(AVFrame*)> currentAVFrame() const = 0;
#endif #endif
void setSize(const QSize& size) const; void setSize(const QSize& size) const;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment