diff options
Diffstat (limited to 'src/plugins/multimedia/windows/mfstream.cpp')
-rw-r--r-- | src/plugins/multimedia/windows/mfstream.cpp | 52 |
1 files changed, 7 insertions, 45 deletions
diff --git a/src/plugins/multimedia/windows/mfstream.cpp b/src/plugins/multimedia/windows/mfstream.cpp index c49971025..fb37ce293 100644 --- a/src/plugins/multimedia/windows/mfstream.cpp +++ b/src/plugins/multimedia/windows/mfstream.cpp @@ -1,45 +1,10 @@ -/**************************************************************************** -** -** 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 #include "mfstream_p.h" #include <QtCore/qcoreapplication.h> +QT_BEGIN_NAMESPACE //MFStream is added for supporting QIODevice type of media source. //It is used to delegate invocations from media foundation(through IMFByteStream) to QIODevice. @@ -53,7 +18,6 @@ MFStream::MFStream(QIODevice *stream, bool ownStream) //to make sure invocations on stream //are happened in the same thread of stream object this->moveToThread(stream->thread()); - connect(stream, SIGNAL(readyRead()), this, SLOT(handleReadyRead())); } MFStream::~MFStream() @@ -287,12 +251,6 @@ void MFStream::doRead() } } - -void MFStream::handleReadyRead() -{ - doRead(); -} - void MFStream::customEvent(QEvent *event) { if (event->type() != QEvent::User) { @@ -362,3 +320,7 @@ void MFStream::AsyncReadState::setBytesRead(ULONG cbRead) { m_cbRead = cbRead; } + +QT_END_NAMESPACE + +#include "moc_mfstream_p.cpp" |