Merge pull request #133 from scratchcpp/mute

Add API for muting audio

Author: adazem009

src/ProjectPlayer.qml

@@ -14,7 +14,8 @@ ProjectScene {
     property alias fps: loader.fps
     property alias turboMode: loader.turboMode
 	property alias cloneLimit: loader.cloneLimit
-	property alias spriteFencing: loader.spriteFencing
+    property alias spriteFencing: loader.spriteFencing
+    property alias mute: loader.mute
     property bool showLoadingProgress: true
     readonly property bool loading: priv.loading
     readonly property int downloadedAssets: loader.downloadedAssets

src/projectloader.cpp

@@ -249,6 +249,7 @@ void ProjectLoader::load()
     m_engine->setStageHeight(m_stageHeight);
     m_engine->setCloneLimit(m_cloneLimit);
     m_engine->setSpriteFencingEnabled(m_spriteFencing);
+    m_engine->setGlobalVolume(m_mute ? 0 : 100);
 
     m_engine->aboutToRender().connect(&ProjectLoader::redraw, this);
     m_engine->monitorAdded().connect(&ProjectLoader::addMonitor, this);
@@ -522,6 +523,26 @@ void ProjectLoader::setSpriteFencing(bool newSpriteFencing)
     emit spriteFencingChanged();
 }
 
+bool ProjectLoader::mute() const
+{
+    return m_mute;
+}
+
+void ProjectLoader::setMute(bool newMute)
+{
+    if (m_mute == newMute)
+        return;
+
+    m_mute = newMute;
+    m_engineMutex.lock();
+
+    if (m_engine)
+        m_engine->setGlobalVolume(newMute ? 0 : 100);
+
+    m_engineMutex.unlock();
+    emit muteChanged();
+}
+
 unsigned int ProjectLoader::downloadedAssets() const
 {
     return m_downloadedAssets;

src/projectloader.h

@@ -35,6 +35,7 @@ class ProjectLoader : public QObject
         Q_PROPERTY(unsigned int stageHeight READ stageHeight WRITE setStageHeight NOTIFY stageHeightChanged)
         Q_PROPERTY(int cloneLimit READ cloneLimit WRITE setCloneLimit NOTIFY cloneLimitChanged)
         Q_PROPERTY(bool spriteFencing READ spriteFencing WRITE setSpriteFencing NOTIFY spriteFencingChanged)
+        Q_PROPERTY(bool mute READ mute WRITE setMute NOTIFY muteChanged)
         Q_PROPERTY(unsigned int downloadedAssets READ downloadedAssets NOTIFY downloadedAssetsChanged)
         Q_PROPERTY(unsigned int assetCount READ assetCount NOTIFY assetCountChanged)
 
@@ -84,6 +85,9 @@ class ProjectLoader : public QObject
         bool spriteFencing() const;
         void setSpriteFencing(bool newSpriteFencing);
 
+        bool mute() const;
+        void setMute(bool newMute);
+
         unsigned int downloadedAssets() const;
 
         unsigned int assetCount() const;
@@ -103,6 +107,7 @@ class ProjectLoader : public QObject
         void stageHeightChanged();
         void cloneLimitChanged();
         void spriteFencingChanged();
+        void muteChanged();
         void downloadedAssetsChanged();
         void assetCountChanged();
         void cloneCreated(SpriteModel *model);
@@ -143,6 +148,7 @@ class ProjectLoader : public QObject
         unsigned int m_stageHeight = 360;
         int m_cloneLimit = 300;
         bool m_spriteFencing = true;
+        bool m_mute = false;
         std::atomic<unsigned int> m_downloadedAssets = 0;
         std::atomic<unsigned int> m_assetCount = 0;
         std::atomic<bool> m_stopLoading = false;

test/projectloader/projectloader_test.cpp

@@ -324,3 +324,23 @@ TEST_F(ProjectLoaderTest, SpriteFencing)
     ASSERT_EQ(spy.count(), 1);
     ASSERT_TRUE(loader.spriteFencing());
 }
+
+TEST_F(ProjectLoaderTest, Mute)
+{
+    ProjectLoader loader;
+    EngineMock engine;
+    loader.setEngine(&engine);
+    ASSERT_FALSE(loader.mute());
+
+    EXPECT_CALL(engine, setGlobalVolume(0));
+    QSignalSpy spy(&loader, SIGNAL(muteChanged()));
+    loader.setMute(true);
+    ASSERT_EQ(spy.count(), 1);
+    ASSERT_TRUE(loader.mute());
+
+    EXPECT_CALL(engine, setGlobalVolume(100));
+    spy.clear();
+    loader.setMute(false);
+    ASSERT_EQ(spy.count(), 1);
+    ASSERT_FALSE(loader.mute());
+}