diff options
Diffstat (limited to 'src/plugins/avfoundation/mediaplayer/avfdisplaylink.mm')
| -rw-r--r-- | src/plugins/avfoundation/mediaplayer/avfdisplaylink.mm | 48 |
1 files changed, 27 insertions, 21 deletions
diff --git a/src/plugins/avfoundation/mediaplayer/avfdisplaylink.mm b/src/plugins/avfoundation/mediaplayer/avfdisplaylink.mm index 47b6b8324..63747e486 100644 --- a/src/plugins/avfoundation/mediaplayer/avfdisplaylink.mm +++ b/src/plugins/avfoundation/mediaplayer/avfdisplaylink.mm @@ -1,31 +1,37 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies). -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL21$ +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** @@ -38,7 +44,7 @@ #include <QtCore/qdebug.h> #endif -#if defined(Q_OS_IOS) +#if defined(Q_OS_IOS) || defined(Q_OS_TVOS) #import <QuartzCore/CADisplayLink.h> #import <Foundation/NSRunLoop.h> #define _m_displayLink static_cast<DisplayLinkObserver*>(m_displayLink) @@ -47,7 +53,7 @@ QT_USE_NAMESPACE -#if defined(Q_OS_IOS) +#if defined(Q_OS_IOS) || defined(Q_OS_TVOS) @interface DisplayLinkObserver : NSObject { AVFDisplayLink *m_avfDisplayLink; @@ -127,7 +133,7 @@ AVFDisplayLink::AVFDisplayLink(QObject *parent) , m_pendingDisplayLinkEvent(false) , m_isActive(false) { -#if defined(Q_OS_IOS) +#if defined(Q_OS_IOS) || defined(Q_OS_TVOS) m_displayLink = [[DisplayLinkObserver alloc] initWithAVFDisplayLink:this]; #else // create display link for the main display @@ -150,7 +156,7 @@ AVFDisplayLink::~AVFDisplayLink() if (m_displayLink) { stop(); -#if defined(Q_OS_IOS) +#if defined(Q_OS_IOS) || defined(Q_OS_TVOS) [_m_displayLink release]; #else CVDisplayLinkRelease(m_displayLink); @@ -172,7 +178,7 @@ bool AVFDisplayLink::isActive() const void AVFDisplayLink::start() { if (m_displayLink && !m_isActive) { -#if defined(Q_OS_IOS) +#if defined(Q_OS_IOS) || defined(Q_OS_TVOS) [_m_displayLink start]; #else CVDisplayLinkStart(m_displayLink); @@ -184,7 +190,7 @@ void AVFDisplayLink::start() void AVFDisplayLink::stop() { if (m_displayLink && m_isActive) { -#if defined(Q_OS_IOS) +#if defined(Q_OS_IOS) || defined(Q_OS_TVOS) [_m_displayLink stop]; #else CVDisplayLinkStop(m_displayLink); @@ -202,7 +208,7 @@ void AVFDisplayLink::displayLinkEvent(const CVTimeStamp *ts) m_displayLinkMutex.lock(); bool pending = m_pendingDisplayLinkEvent; m_pendingDisplayLinkEvent = true; -#if defined(Q_OS_IOS) +#if defined(Q_OS_IOS) || defined(Q_OS_TVOS) Q_UNUSED(ts); memset(&m_frameTimeStamp, 0, sizeof(CVTimeStamp)); #else |