diff options
Diffstat (limited to 'src/plugins/multimedia/windows/decoder/mfdecodersourcereader_p.h')
-rw-r--r-- | src/plugins/multimedia/windows/decoder/mfdecodersourcereader_p.h | 55 |
1 files changed, 11 insertions, 44 deletions
diff --git a/src/plugins/multimedia/windows/decoder/mfdecodersourcereader_p.h b/src/plugins/multimedia/windows/decoder/mfdecodersourcereader_p.h index da35f466e..dee6f8bf5 100644 --- a/src/plugins/multimedia/windows/decoder/mfdecodersourcereader_p.h +++ b/src/plugins/multimedia/windows/decoder/mfdecodersourcereader_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Mobility Components. -** -** $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 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 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. -** -** 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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef MFDECODERSOURCEREADER_H #define MFDECODERSOURCEREADER_H @@ -57,9 +21,9 @@ #include <QtCore/qobject.h> #include "qaudioformat.h" -#include <private/qwindowsiupointer_p.h> +#include <private/qcomptr_p.h> -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE class MFDecoderSourceReader : public QObject, public IMFSourceReaderCallback { @@ -68,8 +32,8 @@ public: MFDecoderSourceReader() {} ~MFDecoderSourceReader() override {} - void clearSource() { m_sourceReader.reset(); } - QWindowsIUPointer<IMFMediaType> setSource(IMFMediaSource *source, QAudioFormat::SampleFormat); + void clearSource() { m_sourceReader.Reset(); } + ComPtr<IMFMediaType> setSource(IMFMediaSource *source, QAudioFormat::SampleFormat); void readNextSample(); @@ -85,12 +49,15 @@ public: STDMETHODIMP OnEvent(DWORD, IMFMediaEvent *) override { return S_OK; } Q_SIGNALS: - void newSample(QWindowsIUPointer<IMFSample>); + void newSample(ComPtr<IMFSample>); void finished(); private: long m_cRef = 1; - QWindowsIUPointer<IMFSourceReader> m_sourceReader; + ComPtr<IMFSourceReader> m_sourceReader; }; + +QT_END_NAMESPACE + #endif//MFDECODERSOURCEREADER_H |