diff --git a/src/audiowrapper_qtmultimedia.cpp b/src/audiowrapper_qtmultimedia.cpp index 13c9ba10..05043483 100644 --- a/src/audiowrapper_qtmultimedia.cpp +++ b/src/audiowrapper_qtmultimedia.cpp @@ -1,290 +1,294 @@ /* * Copyright 2017 Matthieu Gallien * * This program is free software: you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 3 of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ #include "audiowrapper.h" #include "powermanagementinterface.h" #include "qtMultimediaLogging.h" #include #include #include "config-upnp-qt.h" class AudioWrapperPrivate { public: PowerManagementInterface mPowerInterface; QMediaPlayer mPlayer; qint64 mSavedPosition = 0.0; qint64 mUndoSavedPosition = 0.0; bool mHasSavedPosition = false; }; AudioWrapper::AudioWrapper(QObject *parent) : QObject(parent), d(std::make_unique()) { connect(&d->mPlayer, &QMediaPlayer::mutedChanged, this, &AudioWrapper::playerMutedChanged); connect(&d->mPlayer, &QMediaPlayer::volumeChanged, this, &AudioWrapper::playerVolumeChanged); connect(&d->mPlayer, &QMediaPlayer::mediaChanged, this, &AudioWrapper::sourceChanged); connect(&d->mPlayer, &QMediaPlayer::mediaStatusChanged, this, &AudioWrapper::statusChanged); connect(&d->mPlayer, &QMediaPlayer::mediaStatusChanged, this, &AudioWrapper::mediaStatusChanged); connect(&d->mPlayer, &QMediaPlayer::stateChanged, this, &AudioWrapper::playbackStateChanged); connect(&d->mPlayer, &QMediaPlayer::stateChanged, this, &AudioWrapper::playerStateChanged); connect(&d->mPlayer, QOverload::of(&QMediaPlayer::error), this, &AudioWrapper::errorChanged); connect(&d->mPlayer, &QMediaPlayer::durationChanged, this, &AudioWrapper::durationChanged); connect(&d->mPlayer, &QMediaPlayer::positionChanged, this, &AudioWrapper::positionChanged); connect(&d->mPlayer, &QMediaPlayer::seekableChanged, this, &AudioWrapper::seekableChanged); } AudioWrapper::~AudioWrapper() = default; bool AudioWrapper::muted() const { return d->mPlayer.isMuted(); } qreal AudioWrapper::volume() const { auto realVolume = static_cast(d->mPlayer.volume() / 100.0); auto userVolume = static_cast(QAudio::convertVolume(realVolume, QAudio::LinearVolumeScale, QAudio::LogarithmicVolumeScale)); return userVolume * 100.0; } QUrl AudioWrapper::source() const { +#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) + return d->mPlayer.media().request().url(); +#else return d->mPlayer.media().canonicalUrl(); +#endif } QMediaPlayer::Error AudioWrapper::error() const { if (d->mPlayer.error() != QMediaPlayer::NoError) { qDebug() << "AudioWrapper::error" << d->mPlayer.errorString(); } return d->mPlayer.error(); } qint64 AudioWrapper::duration() const { return d->mPlayer.duration(); } qint64 AudioWrapper::position() const { return d->mPlayer.position(); } bool AudioWrapper::seekable() const { return d->mPlayer.isSeekable(); } QMediaPlayer::State AudioWrapper::playbackState() const { return d->mPlayer.state(); } QMediaPlayer::MediaStatus AudioWrapper::status() const { return d->mPlayer.mediaStatus(); } void AudioWrapper::setMuted(bool muted) { d->mPlayer.setMuted(muted); } void AudioWrapper::setVolume(qreal volume) { qCDebug(orgKdeElisaPlayerQtMultimedia) << "AudioWrapper::setVolume" << volume; auto realVolume = static_cast(QAudio::convertVolume(volume / 100.0, QAudio::LogarithmicVolumeScale, QAudio::LinearVolumeScale)); d->mPlayer.setVolume(qRound(realVolume * 100)); } void AudioWrapper::setSource(const QUrl &source) { qCDebug(orgKdeElisaPlayerQtMultimedia) << "AudioWrapper::setSource" << source; d->mPlayer.setMedia({source}); } void AudioWrapper::setPosition(qint64 position) { qCDebug(orgKdeElisaPlayerQtMultimedia) << "AudioWrapper::setPosition" << position; if (d->mPlayer.duration() <= 0) { savePosition(position); return; } d->mPlayer.setPosition(position); } void AudioWrapper::play() { qCDebug(orgKdeElisaPlayerQtMultimedia) << "AudioWrapper::play"; d->mPlayer.play(); if (d->mHasSavedPosition) { qCDebug(orgKdeElisaPlayerQtMultimedia) << "AudioWrapper::playerDurationSignalChanges" << "restore old position" << d->mSavedPosition; setPosition(d->mSavedPosition); d->mHasSavedPosition = false; } } void AudioWrapper::pause() { qCDebug(orgKdeElisaPlayerQtMultimedia) << "AudioWrapper::pause"; d->mPlayer.pause(); } void AudioWrapper::stop() { qCDebug(orgKdeElisaPlayerQtMultimedia) << "AudioWrapper::stop"; d->mPlayer.stop(); } void AudioWrapper::seek(qint64 position) { qCDebug(orgKdeElisaPlayerQtMultimedia) << "AudioWrapper::seek" << position; d->mPlayer.setPosition(position); } void AudioWrapper::mediaStatusChanged() { qCDebug(orgKdeElisaPlayerQtMultimedia) << "AudioWrapper::mediaStatusChanged"; } void AudioWrapper::playerStateChanged() { qCDebug(orgKdeElisaPlayerQtMultimedia) << "AudioWrapper::playerStateChanged"; switch(d->mPlayer.state()) { case QMediaPlayer::State::StoppedState: Q_EMIT stopped(); d->mPowerInterface.setPreventSleep(false); break; case QMediaPlayer::State::PlayingState: Q_EMIT playing(); d->mPowerInterface.setPreventSleep(true); break; case QMediaPlayer::State::PausedState: Q_EMIT paused(); d->mPowerInterface.setPreventSleep(false); break; } } void AudioWrapper::playerVolumeChanged() { qCDebug(orgKdeElisaPlayerQtMultimedia) << "AudioWrapper::playerVolumeChanged"; QTimer::singleShot(0, [this]() {Q_EMIT volumeChanged();}); } void AudioWrapper::playerMutedChanged() { qCDebug(orgKdeElisaPlayerQtMultimedia) << "AudioWrapper::playerMutedChanged"; QTimer::singleShot(0, [this]() {Q_EMIT mutedChanged(muted());}); } void AudioWrapper::playerStateSignalChanges(QMediaPlayer::State newState) { qCDebug(orgKdeElisaPlayerQtMultimedia) << "AudioWrapper::playerStateSignalChanges" << newState; QMetaObject::invokeMethod(this, [this, newState]() {Q_EMIT playbackStateChanged(newState);}, Qt::QueuedConnection); } void AudioWrapper::mediaStatusSignalChanges(QMediaPlayer::MediaStatus newStatus) { qCDebug(orgKdeElisaPlayerQtMultimedia) << "AudioWrapper::mediaStatusSignalChanges" << newStatus; QMetaObject::invokeMethod(this, [this, newStatus]() {Q_EMIT statusChanged(newStatus);}, Qt::QueuedConnection); } void AudioWrapper::playerDurationSignalChanges(qint64 newDuration) { qCDebug(orgKdeElisaPlayerQtMultimedia) << "AudioWrapper::playerDurationSignalChanges" << newDuration; QMetaObject::invokeMethod(this, [this, newDuration]() {Q_EMIT durationChanged(newDuration);}, Qt::QueuedConnection); } void AudioWrapper::playerPositionSignalChanges(qint64 newPosition) { QMetaObject::invokeMethod(this, [this, newPosition]() {Q_EMIT positionChanged(newPosition);}, Qt::QueuedConnection); } void AudioWrapper::playerVolumeSignalChanges() { QMetaObject::invokeMethod(this, [this]() {Q_EMIT volumeChanged();}, Qt::QueuedConnection); } void AudioWrapper::playerMutedSignalChanges(bool isMuted) { QMetaObject::invokeMethod(this, [this, isMuted]() {Q_EMIT mutedChanged(isMuted);}, Qt::QueuedConnection); } void AudioWrapper::playerSeekableSignalChanges(bool isSeekable) { QMetaObject::invokeMethod(this, [this, isSeekable]() {Q_EMIT seekableChanged(isSeekable);}, Qt::QueuedConnection); } void AudioWrapper::saveUndoPosition(qint64 position) { qCDebug(orgKdeElisaPlayerQtMultimedia) << "AudioWrapper::saveUndoPosition" << position; d->mUndoSavedPosition = position; } void AudioWrapper::restoreUndoPosition() { qCDebug(orgKdeElisaPlayerQtMultimedia) << "AudioWrapper::restoreUndoPosition"; d->mHasSavedPosition = true; d->mSavedPosition = d->mUndoSavedPosition; } void AudioWrapper::savePosition(qint64 position) { qCDebug(orgKdeElisaPlayerQtMultimedia) << "AudioWrapper::savePosition" << position; if (!d->mHasSavedPosition) { d->mHasSavedPosition = true; d->mSavedPosition = position; qCDebug(orgKdeElisaPlayerQtMultimedia) << "AudioWrapper::savePosition" << "restore old position" << d->mSavedPosition; } } #include "moc_audiowrapper.cpp"