diff --git a/ScreenPlay/src/screenplaymanager.cpp b/ScreenPlay/src/screenplaymanager.cpp index db4a969c..df9f6182 100644 --- a/ScreenPlay/src/screenplaymanager.cpp +++ b/ScreenPlay/src/screenplaymanager.cpp @@ -313,17 +313,12 @@ void ScreenPlayManager::requestProjectSettingsAtMonitorIndex(const int index) /*! \brief Set a wallpaper \a value at a given \a index and \a key. */ -void ScreenPlayManager::setWallpaperValueAtMonitorIndex(const int index, const QString& key, const QVariant& value) +void ScreenPlayManager::setWallpaperValueAtMonitorIndex(const int index, const QString& key, const QString& value) { if (auto appID = m_monitorListModel->getAppIDByMonitorIndex(index)) { if (key == "volume" || key == "currentTime" || key == "playbackRate") { - bool ok = false; - float _value = value.toFloat(&ok); - if (ok) { - setWallpaperValue(*appID, key, _value); - } else - qWarning() << "Could not convert " << key << " to float with value " << value; + setWallpaperValue(*appID, key, value); } setWallpaperValue(*appID, key, value); } else { @@ -434,7 +429,7 @@ bool ScreenPlayManager::closeWallpaper(const QString& appID) /*! \brief Sets a given \a value to a given \a key. The \a appID is used to identify the receiver socket. */ -void ScreenPlayManager::setWallpaperValue(const QString& appID, const QString& key, const QVariant& value) +void ScreenPlayManager::setWallpaperValue(const QString& appID, const QString& key, const QString& value) { for (const auto& wallpaper : qAsConst(m_screenPlayWallpapers)) { if (wallpaper->appID() == appID) { diff --git a/ScreenPlay/src/screenplaymanager.h b/ScreenPlay/src/screenplaymanager.h index bb73cf75..9af39b6b 100644 --- a/ScreenPlay/src/screenplaymanager.h +++ b/ScreenPlay/src/screenplaymanager.h @@ -124,7 +124,7 @@ public slots: bool removeWallpaperAt(const int index); void requestProjectSettingsAtMonitorIndex(const int index); - void setWallpaperValueAtMonitorIndex(const int index, const QString& key, const QVariant &value); + void setWallpaperValueAtMonitorIndex(const int index, const QString& key, const QString &value); void setAllWallpaperValue(const QString& key, const QString& value); ScreenPlayWallpaper* getWallpaperByAppID(const QString& appID) const; @@ -133,7 +133,7 @@ public slots: void closeAllWidgets(); void closeConntectionByType(const QStringList& list); bool closeWallpaper(const QString& appID); - void setWallpaperValue(const QString& appID, const QString& key, const QVariant& value); + void setWallpaperValue(const QString& appID, const QString& key, const QString &value); void setActiveWallpaperCounter(int activeWallpaperCounter) { diff --git a/ScreenPlay/src/screenplaywallpaper.cpp b/ScreenPlay/src/screenplaywallpaper.cpp index 068f5a11..c20e57cd 100644 --- a/ScreenPlay/src/screenplaywallpaper.cpp +++ b/ScreenPlay/src/screenplaywallpaper.cpp @@ -141,10 +141,10 @@ void ScreenPlayWallpaper::processError(QProcess::ProcessError error) qDebug() << "EX: " << error; } -void ScreenPlayWallpaper::setWallpaperValue(const QString& key, const QVariant& value, const bool save) +void ScreenPlayWallpaper::setWallpaperValue(const QString& key, const QString& value, const bool save) { QJsonObject obj; - obj.insert(key, value.toString()); + obj.insert(key, value); if (key == "volume") { setVolume(value.toFloat()); @@ -153,7 +153,7 @@ void ScreenPlayWallpaper::setWallpaperValue(const QString& key, const QVariant& setPlaybackRate(value.toFloat()); } if (key == "fillmode") { - setFillMode(QStringToEnum(value.toString(), FillMode::FillMode::Cover)); + setFillMode(QStringToEnum(value, FillMode::FillMode::Cover)); } m_connection->sendMessage(QJsonDocument(obj).toJson(QJsonDocument::Compact)); @@ -167,7 +167,7 @@ void ScreenPlayWallpaper::setSDKConnection(const std::shared_ptr& m_connection = connection; QTimer::singleShot(500, [this]() { if (playbackRate() != 1.0) { - setWallpaperValue("playbackRate", playbackRate(), false); + setWallpaperValue("playbackRate", QString::number(playbackRate()), false); } }); diff --git a/ScreenPlay/src/screenplaywallpaper.h b/ScreenPlay/src/screenplaywallpaper.h index 5894fc56..e0ad2ab1 100644 --- a/ScreenPlay/src/screenplaywallpaper.h +++ b/ScreenPlay/src/screenplaywallpaper.h @@ -164,7 +164,7 @@ signals: public slots: void processExit(int exitCode, QProcess::ExitStatus exitStatus); void processError(QProcess::ProcessError error); - void setWallpaperValue(const QString& key, const QVariant& value, const bool save = false); + void setWallpaperValue(const QString& key, const QString &value, const bool save = false); void setScreenNumber(QVector screenNumber) {