mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-09-29 07:21:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Qt: try to fix sound effects

Browse Source 
Don't re-use sound effect objects.
Allow 3 sounds simultaneously.
This commit is contained in:
Megamouse 2024-04-19 03:13:46 +02:00
parent 1444981bdc
commit e48bd29584
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rpcs3/rpcs3qt/gui_application.cpp
View File

@ -606,11 +606,19 @@ void gui_application::InitializeCallbacks()
{ {
if (fs::is_file(path)) if (fs::is_file(path))
{ {
m_sound_effect.stop(); // Allow to play 3 sound effects at the same time
m_sound_effect.setSource(QUrl::fromLocalFile(qstr(path))); while (m_sound_effects.size() >= 3)
m_sound_effect.setVolume(g_cfg.audio.volume * 0.01f); {
m_sound_effect.setLoopCount(1); m_sound_effects.pop_front();
m_sound_effect.play(); }
// Create a new sound effect. Re-using the same object seems to be broken for some users starting with Qt 6.6.3.
std::unique_ptr<QSoundEffect> sound_effect = std::make_unique<QSoundEffect>();
sound_effect->setSource(QUrl::fromLocalFile(qstr(path)));
sound_effect->setVolume(g_cfg.audio.volume * 0.01f);
sound_effect->play();
m_sound_effects.push_back(std::move(sound_effect));
} }
}); });
}; };

3
rpcs3/rpcs3qt/gui_application.h
View File

@ -16,6 +16,7 @@
#include <memory> #include <memory>
#include <functional> #include <functional>
#include <deque>
class gs_frame; class gs_frame;
class main_window; class main_window;
@ -96,7 +97,7 @@ private:
QTimer m_timer; QTimer m_timer;
QElapsedTimer m_timer_playtime; QElapsedTimer m_timer_playtime;
QSoundEffect m_sound_effect{}; std::deque<std::unique_ptr<QSoundEffect>> m_sound_effects{};
std::shared_ptr<emu_settings> m_emu_settings; std::shared_ptr<emu_settings> m_emu_settings;
std::shared_ptr<gui_settings> m_gui_settings; std::shared_ptr<gui_settings> m_gui_settings;