diff options
| author | bunnei <bunneidev@gmail.com> | 2022-09-15 13:50:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-15 13:50:13 -0700 |
| commit | e85bda5f31763359b69fbcad5c121995e1ad7074 (patch) | |
| tree | cd9e85c7fabb334f2d19c20e3eb36c22e1883a21 /src/audio_core/sink/sdl2_sink.cpp | |
| parent | b5a06bc419a4baf21e22f69c4b6e61e0d2137e5b (diff) | |
| parent | e93e898df528d013e2e0cfeba22e2b6d76bf99b6 (diff) | |
Merge pull request #8878 from Kelebek1/remove_pause
Remove pause callbacks from coretiming
Diffstat (limited to 'src/audio_core/sink/sdl2_sink.cpp')
| -rw-r--r-- | src/audio_core/sink/sdl2_sink.cpp | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/src/audio_core/sink/sdl2_sink.cpp b/src/audio_core/sink/sdl2_sink.cpp index 7ee1dd7cd..1bd001b94 100644 --- a/src/audio_core/sink/sdl2_sink.cpp +++ b/src/audio_core/sink/sdl2_sink.cpp @@ -108,17 +108,12 @@ public: * Default false. */ void Start(bool resume = false) override { - if (device == 0) { + if (device == 0 || !paused) { return; } - if (resume && was_playing) { - SDL_PauseAudioDevice(device, 0); - paused = false; - } else if (!resume) { - SDL_PauseAudioDevice(device, 0); - paused = false; - } + paused = false; + SDL_PauseAudioDevice(device, 0); } /** @@ -126,11 +121,11 @@ public: */ void Stop() override { Unstall(); - if (device == 0) { + if (device == 0 || paused) { return; } - SDL_PauseAudioDevice(device, 1); paused = true; + SDL_PauseAudioDevice(device, 1); } private: @@ -207,18 +202,6 @@ void SDLSink::CloseStreams() { sink_streams.clear(); } -void SDLSink::PauseStreams() { - for (auto& stream : sink_streams) { - stream->Stop(); - } -} - -void SDLSink::UnpauseStreams() { - for (auto& stream : sink_streams) { - stream->Start(); - } -} - f32 SDLSink::GetDeviceVolume() const { if (sink_streams.empty()) { return 1.0f; |
