diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index 2b21dd28..a2b48800 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -320,6 +320,8 @@ if(WIN32) PATTERN "imageformats/qtiff.dll" PATTERN "imageformats/qwbmp.dll" PATTERN "imageformats/qwebp.dll" + PATTERN "mediaservice/dsengine.dll" + PATTERN "mediaservice/wmfengine.dll" PATTERN "platforms/qdirect2d.dll" PATTERN "platforms/qminimal.dll" PATTERN "platforms/qoffscreen.dll" diff --git a/cockatrice/src/soundengine.cpp b/cockatrice/src/soundengine.cpp index dd79e550..f2918cf5 100644 --- a/cockatrice/src/soundengine.cpp +++ b/cockatrice/src/soundengine.cpp @@ -2,10 +2,13 @@ #include "settingscache.h" -#include #include #include +#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) +#include +#endif + #define DEFAULT_THEME_NAME "Default" #define TEST_SOUND_FILENAME "player_join" @@ -23,7 +26,7 @@ SoundEngine::~SoundEngine() { if (player) { player->deleteLater(); - player = 0; + player = nullptr; } } @@ -48,7 +51,7 @@ void SoundEngine::soundEnabledChanged() } } -void SoundEngine::playSound(QString fileName) +void SoundEngine::playSound(const QString &fileName) { if (!player) { return; diff --git a/cockatrice/src/soundengine.h b/cockatrice/src/soundengine.h index a386cea8..11304874 100644 --- a/cockatrice/src/soundengine.h +++ b/cockatrice/src/soundengine.h @@ -15,9 +15,9 @@ class SoundEngine : public QObject { Q_OBJECT public: - SoundEngine(QObject *parent = nullptr); - ~SoundEngine(); - void playSound(QString fileName); + explicit SoundEngine(QObject *parent = nullptr); + ~SoundEngine() override; + void playSound(const QString &fileName); QStringMap &getAvailableThemes(); private: