diff options
Diffstat (limited to 'src/multimedia/platform/qplatformmediaplayer_p.h')
| -rw-r--r-- | src/multimedia/platform/qplatformmediaplayer_p.h | 90 |
1 files changed, 38 insertions, 52 deletions
diff --git a/src/multimedia/platform/qplatformmediaplayer_p.h b/src/multimedia/platform/qplatformmediaplayer_p.h index 0c61685ff..3f9d57677 100644 --- a/src/multimedia/platform/qplatformmediaplayer_p.h +++ b/src/multimedia/platform/qplatformmediaplayer_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Toolkit. -** -** $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) 2021 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 // // W A R N I N G @@ -58,6 +22,7 @@ #include <QtCore/qpair.h> #include <QtCore/private/qglobal_p.h> +#include <QtCore/qobject.h> QT_BEGIN_NAMESPACE @@ -112,36 +77,38 @@ public: virtual int activeTrack(TrackType) { return -1; } virtual void setActiveTrack(TrackType, int /*streamNumber*/) {} - void durationChanged(qint64 duration) { player->durationChanged(duration); } + void durationChanged(std::chrono::milliseconds ms) { durationChanged(ms.count()); } + void durationChanged(qint64 duration) { emit player->durationChanged(duration); } + void positionChanged(std::chrono::milliseconds ms) { positionChanged(ms.count()); } void positionChanged(qint64 position) { if (m_position == position) return; m_position = position; - player->positionChanged(position); + emit player->positionChanged(position); } void audioAvailableChanged(bool audioAvailable) { if (m_audioAvailable == audioAvailable) return; m_audioAvailable = audioAvailable; - player->hasAudioChanged(audioAvailable); + emit player->hasAudioChanged(audioAvailable); } void videoAvailableChanged(bool videoAvailable) { if (m_videoAvailable == videoAvailable) return; m_videoAvailable = videoAvailable; - player->hasVideoChanged(videoAvailable); + emit player->hasVideoChanged(videoAvailable); } void seekableChanged(bool seekable) { if (m_seekable == seekable) return; m_seekable = seekable; - player->seekableChanged(seekable); + emit player->seekableChanged(seekable); } - void playbackRateChanged(qreal rate) { player->playbackRateChanged(rate); } - void bufferProgressChanged(float progress) { player->bufferProgressChanged(progress); } - void metaDataChanged() { player->metaDataChanged(); } - void tracksChanged() { player->tracksChanged(); } - void activeTracksChanged() { player->activeTracksChanged(); } + void playbackRateChanged(qreal rate) { emit player->playbackRateChanged(rate); } + void bufferProgressChanged(float progress) { emit player->bufferProgressChanged(progress); } + void metaDataChanged() { emit player->metaDataChanged(); } + void tracksChanged() { emit player->tracksChanged(); } + void activeTracksChanged() { emit player->activeTracksChanged(); } void stateChanged(QMediaPlayer::PlaybackState newState); void mediaStatusChanged(QMediaPlayer::MediaStatus status); @@ -152,7 +119,8 @@ public: return isSeekable() && (m_loops < 0 || ++m_currentLoop < m_loops); } int loops() { return m_loops; } - void setLoops(int loops) { + virtual void setLoops(int loops) + { if (m_loops == loops) return; m_loops = loops; @@ -160,9 +128,8 @@ public: } protected: - explicit QPlatformMediaPlayer(QMediaPlayer *parent = nullptr) - : player(parent) - {} + explicit QPlatformMediaPlayer(QMediaPlayer *parent = nullptr); + private: QMediaPlayer *player = nullptr; QMediaPlayer::MediaStatus m_status = QMediaPlayer::NoMedia; @@ -175,6 +142,25 @@ private: qint64 m_position = 0; }; +#ifndef QT_NO_DEBUG_STREAM +inline QDebug operator<<(QDebug dbg, QPlatformMediaPlayer::TrackType type) +{ + QDebugStateSaver save(dbg); + dbg.nospace(); + + switch (type) { + case QPlatformMediaPlayer::TrackType::AudioStream: + return dbg << "AudioStream"; + case QPlatformMediaPlayer::TrackType::VideoStream: + return dbg << "VideoStream"; + case QPlatformMediaPlayer::TrackType::SubtitleStream: + return dbg << "SubtitleStream"; + default: + Q_UNREACHABLE_RETURN(dbg); + } +} +#endif + QT_END_NAMESPACE |