Skip to content

Add API for muting audio #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/ProjectPlayer.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 21 additions & 0 deletions src/projectloader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down
6 changes: 6 additions & 0 deletions src/projectloader.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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;
Expand All @@ -103,6 +107,7 @@ class ProjectLoader : public QObject
void stageHeightChanged();
void cloneLimitChanged();
void spriteFencingChanged();
void muteChanged();
void downloadedAssetsChanged();
void assetCountChanged();
void cloneCreated(SpriteModel *model);
Expand Down Expand Up @@ -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;
Expand Down
20 changes: 20 additions & 0 deletions test/projectloader/projectloader_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Loading