Skip to content
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.

Sign up for GitHub

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

Refactor Mixer signal #552

Merged
merged 5 commits into from
Mar 26, 2020
Merged

Refactor Mixer signal #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e8e3d22
Rename music_finished_hook to onMusicFinished
DanRStevens Mar 26, 2020
8b194d6
Rename MIXER_HOOK_CALLBACK_SIGNAL to musicFinished
DanRStevens Mar 26, 2020
fc78468
Wrap musicFinished signal in unnamed namespace
DanRStevens Mar 26, 2020
469f575
Document why variable is global rather than member
DanRStevens Mar 26, 2020
7b3da86
Reverse order of handler init/deinit
DanRStevens Mar 26, 2020
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
2 changes: 1 addition & 1 deletion include/NAS2D/Mixer/MixerSDL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class MixerSDL : public Mixer
void unmute() override;

private:
void music_finished_hook();
void onMusicFinished();
};

}
21 changes: 12 additions & 9 deletions src/Mixer/MixerSDL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,14 @@ using namespace NAS2D::Exception;
extern std::map<std::string, MusicInfo> MUSIC_REF_MAP;


// ==================================================================================
// INTEROP WITH SDL2_MIXER
// ==================================================================================
NAS2D::Signals::Signal<> MIXER_HOOK_CALLBACK_SIGNAL;
// ==================================================================================
namespace {
// ==================================================================================
// INTEROP WITH SDL2_MIXER
// ==================================================================================
// Global so it can be accessed without capturing `this`
NAS2D::Signals::Signal<> musicFinished;
// ==================================================================================
}


/*
Expand All @@ -56,8 +59,8 @@ MixerSDL::MixerSDL()
soundVolume(c.audioSfxVolume());
musicVolume(c.audioMusicVolume());

Mix_HookMusicFinished([](){ MIXER_HOOK_CALLBACK_SIGNAL(); });
MIXER_HOOK_CALLBACK_SIGNAL.connect(this, &MixerSDL::music_finished_hook);
musicFinished.connect(this, &MixerSDL::onMusicFinished);
Mix_HookMusicFinished([](){ musicFinished(); });

std::cout << "done." << std::endl;
}
Expand All @@ -76,15 +79,15 @@ MixerSDL::~MixerSDL()

Mix_CloseAudio();

MIXER_HOOK_CALLBACK_SIGNAL.disconnect(this, &MixerSDL::music_finished_hook);
Mix_HookMusicFinished(nullptr);
musicFinished.disconnect(this, &MixerSDL::onMusicFinished);

SDL_QuitSubSystem(SDL_INIT_AUDIO);

std::cout << "Mixer Terminated." << std::endl;
}

void MixerSDL::music_finished_hook()
void MixerSDL::onMusicFinished()
{
mMusicComplete.emit();
}
Expand Down