TheCloud/libSDL2pp
1
0
Fork 0
mirror of https://github.com/libSDL2pp/libSDL2pp.git synced 2025-09-09 07:18:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Exception safety

Browse Source 
Suck callback in only after everything was created to not needlessly
destroy it if exception is thrown in the constructor
This commit is contained in:
Dmitry Marakasov 2014-12-16 07:06:20 +03:00
parent 5abf3558be
commit 70fafab8dd
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SDL2pp/AudioDevice.cc
View File

@ -30,9 +30,9 @@ void AudioDevice::SDLCallback(void *userdata, Uint8* stream, int len) {
audiodevice->callback_(stream, len);
}
AudioDevice::AudioDevice(const std::string& device, bool iscapture, const AudioSpec& spec, AudioDevice::AudioCallback&& callback) : callback_(std::move(callback)) {
AudioDevice::AudioDevice(const std::string& device, bool iscapture, const AudioSpec& spec, AudioDevice::AudioCallback&& callback) {
SDL_AudioSpec spec_with_callback = *spec.Get();
if (callback_) {
if (callback) {
spec_with_callback.callback = SDLCallback;
spec_with_callback.userdata = static_cast<void*>(this);
}
@ -40,11 +40,13 @@ AudioDevice::AudioDevice(const std::string& device, bool iscapture, const AudioS
if ((device_id_ = SDL_OpenAudioDevice(device.empty() ? nullptr : device.c_str(), iscapture ? 1 : 0, &spec_with_callback, &obtained, 0)) == 0)
throw Exception("SDL_OpenAudioDevice failed");
callback_ = std::move(callback);
}
AudioDevice::AudioDevice(const std::string& device, bool iscapture, AudioSpec& spec, int allowed_changes, AudioDevice::AudioCallback&& callback) : callback_(std::move(callback)) {
AudioDevice::AudioDevice(const std::string& device, bool iscapture, AudioSpec& spec, int allowed_changes, AudioDevice::AudioCallback&& callback) {
SDL_AudioSpec spec_with_callback = *spec.Get();
if (callback_) {
if (callback) {
spec_with_callback.callback = SDLCallback;
spec_with_callback.userdata = static_cast<void*>(this);
}
@ -54,6 +56,8 @@ AudioDevice::AudioDevice(const std::string& device, bool iscapture, AudioSpec& s
throw Exception("SDL_OpenAudioDevice failed");
spec.MergeChanges(obtained);
callback_ = std::move(callback);
}
AudioDevice::~AudioDevice() {