-
Notifications
You must be signed in to change notification settings - Fork 199
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix #2865
- Loading branch information
Showing
15 changed files
with
1,802 additions
and
78 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| /* | ||
| * This file is part of EasyRPG Player. | ||
| * | ||
| * EasyRPG Player is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * EasyRPG Player is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with EasyRPG Player. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| #include "system.h" | ||
|
|
||
| #ifdef SUPPORT_AUDIO | ||
|
|
||
| #include <cassert> | ||
| #include <cstdint> | ||
| #include <chrono> | ||
| #include <SDL.h> | ||
| #include <SDL_audio.h> | ||
| #include <SDL_version.h> | ||
|
|
||
| #ifdef EMSCRIPTEN | ||
| # include <emscripten.h> | ||
| #endif | ||
|
|
||
| #include "sdl2_audio.h" | ||
| #include "output.h" | ||
|
|
||
| using namespace std::chrono_literals; | ||
|
|
||
| namespace { | ||
| SDL_AudioDeviceID audio_dev_id = 0; | ||
| } | ||
|
|
||
| void sdl_audio_callback(void* userdata, uint8_t* stream, int length) { | ||
| // no mutex locking required, SDL does this before calling | ||
|
|
||
| static_cast<GenericAudio*>(userdata)->Decode(stream, length); | ||
| } | ||
|
|
||
| AudioDecoder::Format sdl_format_to_format(Uint16 format) { | ||
| switch (format) { | ||
| case AUDIO_U8: | ||
| return AudioDecoder::Format::U8; | ||
| case AUDIO_S8: | ||
| return AudioDecoder::Format::S8; | ||
| case AUDIO_U16SYS: | ||
| return AudioDecoder::Format::U16; | ||
| case AUDIO_S16SYS: | ||
| return AudioDecoder::Format::S16; | ||
| case AUDIO_S32: | ||
| return AudioDecoder::Format::S32; | ||
| case AUDIO_F32: | ||
| return AudioDecoder::Format::F32; | ||
| default: | ||
| Output::Warning("Couldn't find GenericAudio format for {:#x}", format); | ||
| assert(false); | ||
| } | ||
|
|
||
| return (AudioDecoder::Format)-1; | ||
| } | ||
|
|
||
| Sdl2Audio::Sdl2Audio(const Game_ConfigAudio& cfg) : | ||
| GenericAudio(cfg) | ||
| { | ||
| if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0) { | ||
| Output::Warning("Couldn't init audio: {}", SDL_GetError()); | ||
| return; | ||
| } | ||
|
|
||
| #ifdef EMSCRIPTEN | ||
| // Get preferred sample rate from Browser (-> OS) | ||
| const int frequency = EM_ASM_INT_V({ | ||
| var context; | ||
| try { | ||
| context = new AudioContext(); | ||
| } catch (e) { | ||
| context = new webkitAudioContext(); | ||
| } | ||
| return context.sampleRate; | ||
| }); | ||
| #else | ||
| const int frequency = 44100; | ||
| #endif | ||
|
|
||
| SDL_AudioSpec want = {}; | ||
| SDL_AudioSpec have = {}; | ||
| want.freq = frequency; | ||
| want.format = AUDIO_S16SYS; | ||
| want.channels = 2; | ||
| want.samples = 2048; | ||
| want.callback = sdl_audio_callback; | ||
| want.userdata = this; | ||
|
|
||
| audio_dev_id = SDL_OpenAudioDevice(nullptr, 0, &want, &have, SDL_AUDIO_ALLOW_FREQUENCY_CHANGE); | ||
| bool init_success = audio_dev_id > 0; | ||
|
|
||
| if (!init_success) { | ||
| Output::Warning("Couldn't open audio: {}", SDL_GetError()); | ||
| return; | ||
| } | ||
|
|
||
| SetFormat(have.freq, sdl_format_to_format(have.format), have.channels); | ||
|
|
||
| // Start Audio | ||
| SDL_PauseAudioDevice(audio_dev_id, 0); | ||
| } | ||
|
|
||
| Sdl2Audio::~Sdl2Audio() { | ||
| SDL_CloseAudioDevice(audio_dev_id); | ||
| } | ||
|
|
||
| void Sdl2Audio::LockMutex() const { | ||
| SDL_LockAudioDevice(audio_dev_id); | ||
| } | ||
|
|
||
| void Sdl2Audio::UnlockMutex() const { | ||
| SDL_UnlockAudioDevice(audio_dev_id); | ||
| } | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| /* | ||
| * This file is part of EasyRPG Player. | ||
| * | ||
| * EasyRPG Player is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * EasyRPG Player is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with EasyRPG Player. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| #ifndef EP_AUDIO_SDL2_H | ||
| #define EP_AUDIO_SDL2_H | ||
|
|
||
| #include "audio_generic.h" | ||
|
|
||
| class Sdl2Audio : public GenericAudio { | ||
| public: | ||
| Sdl2Audio(const Game_ConfigAudio& cfg); | ||
| ~Sdl2Audio(); | ||
|
|
||
| void LockMutex() const override; | ||
| void UnlockMutex() const override; | ||
| }; | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.