diff options
Diffstat (limited to 'src/plugins/avfoundation/mediaplayer/avfdisplaylink.mm')
| -rw-r--r-- | src/plugins/avfoundation/mediaplayer/avfdisplaylink.mm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/avfoundation/mediaplayer/avfdisplaylink.mm b/src/plugins/avfoundation/mediaplayer/avfdisplaylink.mm index 63747e486..bae18bc0a 100644 --- a/src/plugins/avfoundation/mediaplayer/avfdisplaylink.mm +++ b/src/plugins/avfoundation/mediaplayer/avfdisplaylink.mm @@ -55,10 +55,6 @@ QT_USE_NAMESPACE #if defined(Q_OS_IOS) || defined(Q_OS_TVOS) @interface DisplayLinkObserver : NSObject -{ - AVFDisplayLink *m_avfDisplayLink; - CADisplayLink *m_displayLink; -} - (void)start; - (void)stop; @@ -67,6 +63,10 @@ QT_USE_NAMESPACE @end @implementation DisplayLinkObserver +{ + AVFDisplayLink *m_avfDisplayLink; + CADisplayLink *m_displayLink; +} - (id)initWithAVFDisplayLink:(AVFDisplayLink *)link { @@ -84,7 +84,7 @@ QT_USE_NAMESPACE { if (m_displayLink) { [m_displayLink release]; - m_displayLink = NULL; + m_displayLink = nullptr; } [super dealloc]; @@ -129,7 +129,7 @@ static CVReturn CVDisplayLinkCallback(CVDisplayLinkRef displayLink, AVFDisplayLink::AVFDisplayLink(QObject *parent) : QObject(parent) - , m_displayLink(0) + , m_displayLink(nullptr) , m_pendingDisplayLinkEvent(false) , m_isActive(false) { @@ -161,13 +161,13 @@ AVFDisplayLink::~AVFDisplayLink() #else CVDisplayLinkRelease(m_displayLink); #endif - m_displayLink = NULL; + m_displayLink = nullptr; } } bool AVFDisplayLink::isValid() const { - return m_displayLink != 0; + return m_displayLink != nullptr; } bool AVFDisplayLink::isActive() const |