diff options
Diffstat (limited to 'src/plugins')
5 files changed, 31 insertions, 22 deletions
diff --git a/src/plugins/ivimedia/media_qtro/CMakeLists.txt b/src/plugins/ivimedia/media_qtro/CMakeLists.txt index 97e003d..f074ae1 100644 --- a/src/plugins/ivimedia/media_qtro/CMakeLists.txt +++ b/src/plugins/ivimedia/media_qtro/CMakeLists.txt @@ -19,7 +19,7 @@ qt_internal_add_plugin(MediaQtROPlugin Qt::IviCore Qt::IviMedia Qt::RemoteObjects - iviremoteobjects_helper_private + Qt::IviRemoteObjectsHelper ) qt6_add_repc_replicas(MediaQtROPlugin ../../../tools/media-simulation-server/qivimediaindexer.rep diff --git a/src/plugins/ivimedia/media_qtro/searchandbrowsemodel.cpp b/src/plugins/ivimedia/media_qtro/searchandbrowsemodel.cpp index 9c86a23..8f24d67 100644 --- a/src/plugins/ivimedia/media_qtro/searchandbrowsemodel.cpp +++ b/src/plugins/ivimedia/media_qtro/searchandbrowsemodel.cpp @@ -43,6 +43,7 @@ #include <QTimer> #include <QSettings> +#include <QIODevice> Q_LOGGING_CATEGORY(qLcROQIviSearchAndBrowseModel, "qtivi.media.qivisearchandbrowsebackend.remoteobjects", QtInfoMsg) diff --git a/src/plugins/ivimedia/media_simulator/mediaplayerbackend.cpp b/src/plugins/ivimedia/media_simulator/mediaplayerbackend.cpp index 8f2eaad..258b47a 100644 --- a/src/plugins/ivimedia/media_simulator/mediaplayerbackend.cpp +++ b/src/plugins/ivimedia/media_simulator/mediaplayerbackend.cpp @@ -68,7 +68,7 @@ MediaPlayerBackend::MediaPlayerBackend(const QSqlDatabase &database, QObject *pa this, &MediaPlayerBackend::onDurationChanged); connect(m_player, &QMediaPlayer::positionChanged, this, &MediaPlayerBackend::onPositionChanged); - connect(m_player, &QMediaPlayer::stateChanged, + connect(m_player, &QMediaPlayer::playbackStateChanged, this, &MediaPlayerBackend::onStateChanged); connect(m_player, &QMediaPlayer::mediaStatusChanged, this, &MediaPlayerBackend::onMediaStatusChanged); @@ -96,11 +96,7 @@ void MediaPlayerBackend::initialize() void MediaPlayerBackend::play() { qCDebug(media) << Q_FUNC_INFO; -#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) - qCDebug(media) << m_player->media().request().url(); -#else - qCDebug(media) << m_player->media().canonicalUrl(); -#endif + qCDebug(media) << m_player->source(); m_requestedState = QIviMediaPlayer::Playing; m_player->play(); } @@ -130,7 +126,7 @@ void MediaPlayerBackend::next() qCDebug(media) << Q_FUNC_INFO; int nextIndex = m_currentIndex + 1; if (m_playMode == QIviMediaPlayer::Shuffle) - nextIndex = qrand() % m_count; + nextIndex = QRandomGenerator::global()->bounded(m_count); else if (m_playMode == QIviMediaPlayer::RepeatTrack) nextIndex = m_currentIndex; else if (m_playMode == QIviMediaPlayer::RepeatAll && nextIndex >= m_count) @@ -144,7 +140,7 @@ void MediaPlayerBackend::previous() qCDebug(media) << Q_FUNC_INFO; int nextIndex = m_currentIndex - 1; if (m_playMode == QIviMediaPlayer::Shuffle) - nextIndex = qrand() % m_count; + nextIndex = QRandomGenerator::global()->bounded(m_count); else if (m_playMode == QIviMediaPlayer::RepeatTrack) nextIndex = m_currentIndex; else if (m_playMode == QIviMediaPlayer::RepeatAll && nextIndex < 0) @@ -174,13 +170,15 @@ void MediaPlayerBackend::fetchData(const QUuid &identifier, int start, int count QStringList queries; queries.append(queryString); - QtConcurrent::run(m_threadPool, + auto future = QtConcurrent::run(m_threadPool, &MediaPlayerBackend::doSqlOperation, this, MediaPlayerBackend::Select, queries, identifier, start, count); + // QtConcurrent::run doesn't allow ignoring the return value + Q_UNUSED(future); } void MediaPlayerBackend::insert(int index, const QVariant &i) @@ -216,10 +214,12 @@ void MediaPlayerBackend::insert(int index, const QVariant &i) } QStringList queries = queryString.split(';'); - QtConcurrent::run(m_threadPool, + auto future = QtConcurrent::run(m_threadPool, &MediaPlayerBackend::doSqlOperation, this, MediaPlayerBackend::Insert, queries, QUuid(), index, 0); + // QtConcurrent::run doesn't allow ignoring the return value + Q_UNUSED(future); } void MediaPlayerBackend::remove(int index) @@ -229,10 +229,12 @@ void MediaPlayerBackend::remove(int index) .arg(index); QStringList queries = queryString.split(';'); - QtConcurrent::run(m_threadPool, + auto future = QtConcurrent::run(m_threadPool, &MediaPlayerBackend::doSqlOperation, this, MediaPlayerBackend::Remove, queries, QUuid(), index, 1); + // QtConcurrent::run doesn't allow ignoring the return value + Q_UNUSED(future); } void MediaPlayerBackend::move(int cur_index, int new_index) @@ -252,10 +254,12 @@ void MediaPlayerBackend::move(int cur_index, int new_index) .arg(delta > 0 ? QStringLiteral("-") : QStringLiteral("+")); QStringList queries = queryString.split(';'); - QtConcurrent::run(m_threadPool, + auto future = QtConcurrent::run(m_threadPool, &MediaPlayerBackend::doSqlOperation, this, MediaPlayerBackend::Move, queries, QUuid(), cur_index, new_index); + // QtConcurrent::run doesn't allow ignoring the return value + Q_UNUSED(future); } QIviMediaPlayer::PlayMode MediaPlayerBackend::playMode() const @@ -414,7 +418,7 @@ void MediaPlayerBackend::setCurrentIndex(int index) //If we the list is empty the current Index needs to updated to an invalid track if (m_count == 0 && index == -1) { m_currentIndex = index; - m_player->setMedia(QUrl()); + m_player->setSource(QUrl()); emit currentTrackChanged(QVariant()); emit currentIndexChanged(m_currentIndex); emit durationChanged(0); @@ -432,10 +436,12 @@ void MediaPlayerBackend::setCurrentIndex(int index) QStringList queries; queries.append(queryString); - QtConcurrent::run(m_threadPool, + auto future = QtConcurrent::run(m_threadPool, &MediaPlayerBackend::doSqlOperation, this, MediaPlayerBackend::SetIndex, queries, QUuid(), m_currentIndex, 0); + // QtConcurrent::run doesn't allow ignoring the return value + Q_UNUSED(future); } void MediaPlayerBackend::setVolume(int volume) @@ -456,7 +462,7 @@ void MediaPlayerBackend::setMuted(bool muted) } } -void MediaPlayerBackend::onStateChanged(QMediaPlayer::State state) +void MediaPlayerBackend::onStateChanged(QMediaPlayer::PlaybackState state) { qCDebug(media) << Q_FUNC_INFO << state; if (state == QMediaPlayer::PlayingState) @@ -490,8 +496,8 @@ void MediaPlayerBackend::onDurationChanged(qint64 duration) void MediaPlayerBackend::onPlayTrack(const QUrl &url) { - bool playing = m_player->state() == QMediaPlayer::PlayingState || m_player->mediaStatus() == QMediaPlayer::EndOfMedia; - m_player->setMedia(url); + bool playing = m_player->playbackState() == QMediaPlayer::PlayingState || m_player->mediaStatus() == QMediaPlayer::EndOfMedia; + m_player->setSource(url); if (playing) m_player->play(); } diff --git a/src/plugins/ivimedia/media_simulator/mediaplayerbackend.h b/src/plugins/ivimedia/media_simulator/mediaplayerbackend.h index 48973c1..b5762c1 100644 --- a/src/plugins/ivimedia/media_simulator/mediaplayerbackend.h +++ b/src/plugins/ivimedia/media_simulator/mediaplayerbackend.h @@ -110,7 +110,7 @@ public Q_SLOTS: void doSqlOperation(MediaPlayerBackend::OperationType type, const QStringList &queries, const QUuid &identifier, int start, int count); private Q_SLOTS: - void onStateChanged(QMediaPlayer::State state); + void onStateChanged(QMediaPlayer::PlaybackState state); void onMediaStatusChanged(QMediaPlayer::MediaStatus status); void onPositionChanged(qint64 position); void onDurationChanged(qint64 duration); diff --git a/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.cpp b/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.cpp index e23843d..57abaeb 100644 --- a/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.cpp +++ b/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.cpp @@ -207,7 +207,8 @@ void SearchAndBrowseBackend::fetchData(const QUuid &identifier, int start, int c whereClause.isEmpty() ? QString() : QStringLiteral("WHERE ") + whereClause, groupBy.isEmpty() ? QString() : QStringLiteral("GROUP BY ") + groupBy); - QtConcurrent::run(m_threadPool, [this, countQuery, identifier]() { + // QtConcurrent::run doesn't allow ignoring the return value + auto future = QtConcurrent::run(m_threadPool, [this, countQuery, identifier]() { QSqlQuery query(m_db); if (query.exec(countQuery)) { while (query.next()) { @@ -226,7 +227,8 @@ void SearchAndBrowseBackend::fetchData(const QUuid &identifier, int start, int c QString::number(start), QString::number(count)); - QtConcurrent::run(m_threadPool, + // QtConcurrent::run doesn't allow ignoring the return value + future = QtConcurrent::run(m_threadPool, &SearchAndBrowseBackend::search, this, identifier, @@ -372,7 +374,7 @@ QString SearchAndBrowseBackend::createWhereClause(const QString &type, QIviAbstr QString operatorString; bool negated = filter->isNegated(); QString value; - if (filter->value().type() == QVariant::String) + if (filter->value().typeId() == QMetaType::QString) value = QStringLiteral("'%1'").arg(filter->value().toString().replace('*', '%')); else value = filter->value().toString(); |