diff options
Diffstat (limited to 'src/plugins/multimedia/windows/player/mfplayercontrol.cpp')
-rw-r--r-- | src/plugins/multimedia/windows/player/mfplayercontrol.cpp | 61 |
1 files changed, 13 insertions, 48 deletions
diff --git a/src/plugins/multimedia/windows/player/mfplayercontrol.cpp b/src/plugins/multimedia/windows/player/mfplayercontrol.cpp index 67a5caa7b..ae0022773 100644 --- a/src/plugins/multimedia/windows/player/mfplayercontrol.cpp +++ b/src/plugins/multimedia/windows/player/mfplayercontrol.cpp @@ -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 #include "mfplayercontrol_p.h" #include "mfplayersession_p.h" @@ -110,7 +74,8 @@ void MFPlayerControl::pause() if (m_state == QMediaPlayer::PausedState) return; - if (m_session->status() == QMediaPlayer::NoMedia) + if (m_session->status() == QMediaPlayer::NoMedia || + m_session->status() == QMediaPlayer::InvalidMedia) return; changeState(QMediaPlayer::PausedState); @@ -158,7 +123,7 @@ void MFPlayerControl::refreshState() #ifdef DEBUG_MEDIAFOUNDATION qDebug() << "MFPlayerControl::emit stateChanged" << m_state; #endif - emit stateChanged(m_state); + stateChanged(m_state); } void MFPlayerControl::handleStatusChanged() @@ -184,7 +149,7 @@ void MFPlayerControl::handleStatusChanged() default: break; } - emit mediaStatusChanged(m_session->status()); + mediaStatusChanged(m_session->status()); refreshState(); } @@ -198,7 +163,7 @@ void MFPlayerControl::handleVideoAvailable() if (m_videoAvailable) return; m_videoAvailable = true; - emit videoAvailableChanged(m_videoAvailable); + videoAvailableChanged(m_videoAvailable); } void MFPlayerControl::handleAudioAvailable() @@ -206,7 +171,7 @@ void MFPlayerControl::handleAudioAvailable() if (m_audioAvailable) return; m_audioAvailable = true; - emit audioAvailableChanged(m_audioAvailable); + audioAvailableChanged(m_audioAvailable); } void MFPlayerControl::resetAudioVideoAvailable() @@ -218,10 +183,10 @@ void MFPlayerControl::resetAudioVideoAvailable() } if (m_audioAvailable) { m_audioAvailable = false; - emit audioAvailableChanged(m_audioAvailable); + audioAvailableChanged(m_audioAvailable); } if (videoDirty) - emit videoAvailableChanged(m_videoAvailable); + videoAvailableChanged(m_videoAvailable); } void MFPlayerControl::handleDurationUpdate(qint64 duration) @@ -229,7 +194,7 @@ void MFPlayerControl::handleDurationUpdate(qint64 duration) if (m_duration == duration) return; m_duration = duration; - emit durationChanged(m_duration); + durationChanged(m_duration); } void MFPlayerControl::handleSeekableUpdate(bool seekable) @@ -237,7 +202,7 @@ void MFPlayerControl::handleSeekableUpdate(bool seekable) if (m_seekable == seekable) return; m_seekable = seekable; - emit seekableChanged(m_seekable); + seekableChanged(m_seekable); } QMediaPlayer::PlaybackState MFPlayerControl::state() const @@ -316,7 +281,7 @@ void MFPlayerControl::handleError(QMediaPlayer::Error errorCode, const QString& { if (isFatal) stop(); - emit error(int(errorCode), errorString); + error(int(errorCode), errorString); } void MFPlayerControl::setActiveTrack(TrackType type, int index) |