[PR #3607] [MERGED] Ds4 Speaker Audio Rebase Fix #3605

New issue

Closed

opened 2026-02-27 22:04:18 +03:00 by kerem · 0 comments

kerem commented

2026-02-27 22:04:18 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/shadps4-emu/shadPS4/pull/3607
Author: @nickci2002
Created: 9/15/2025
Status: ✅ Merged
Merged: 9/18/2025
Merged by: @georgemoralis

Base: main ← Head: DS4-Speaker-Rebase-Fix

📝 Commits (10+)

c5f2a5c Logic update, no QT ui
a0c240a Fixing errors
1d41dca Gui boxes
d5936b5 fixes
0115e40 prevent device list refreshing too fast when game not running
db5d2c1 Removed duplicate Socket declarations in kernel/file_system.cpp and fs.h
82285d5 Fixed clang-format and micDevice errors
e4c54f8 Ran clang-format and fixed rebase compiler issues
1a9872f Settings dialog fix
4ee4462 Addressed squidbus' concerns

📊 Changes

12 files changed (+304 additions, -106 deletions)

View changed files

📝 src/common/config.cpp (+42 -13)
📝 src/common/config.h (+5 -0)
📝 src/core/libraries/audio/audioout.cpp (+2 -2)
📝 src/core/libraries/audio/audioout.h (+1 -1)
📝 src/core/libraries/audio/sdl_audio.cpp (+39 -3)
📝 src/qt_gui/gui_context_menus.h (+2 -2)
📝 src/qt_gui/main_window.cpp (+4 -2)
📝 src/qt_gui/sdl_event_wrapper.cpp (+8 -0)
📝 src/qt_gui/sdl_event_wrapper.h (+1 -0)
📝 src/qt_gui/settings_dialog.cpp (+160 -73)
📝 src/qt_gui/settings_dialog.h (+10 -4)
📝 src/qt_gui/settings_dialog.ui (+30 -6)

📄 Description

A new PR with a proper rebase.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/shadps4-emu/shadPS4/pull/3607 **Author:** [@nickci2002](https://github.com/nickci2002) **Created:** 9/15/2025 **Status:** ✅ Merged **Merged:** 9/18/2025 **Merged by:** [@georgemoralis](https://github.com/georgemoralis) **Base:** `main` ← **Head:** `DS4-Speaker-Rebase-Fix` --- ### 📝 Commits (10+) - [`c5f2a5c`](https://github.com/shadps4-emu/shadPS4/commit/c5f2a5cf75b2cdaecc482d86c07b97d20cf7b2f7) Logic update, no QT ui - [`a0c240a`](https://github.com/shadps4-emu/shadPS4/commit/a0c240a0263428e2c5a45f4347de7273aefbacf6) Fixing errors - [`1d41dca`](https://github.com/shadps4-emu/shadPS4/commit/1d41dca762fb2559383d7fed6f2d1ee50d373371) Gui boxes - [`d5936b5`](https://github.com/shadps4-emu/shadPS4/commit/d5936b5dbd138fba1cda96e23d9466b2e6046ed4) fixes - [`0115e40`](https://github.com/shadps4-emu/shadPS4/commit/0115e40386259ca433fa35b8f2d71e1c8c1e5153) prevent device list refreshing too fast when game not running - [`db5d2c1`](https://github.com/shadps4-emu/shadPS4/commit/db5d2c10bbdfa14b65ea19133c62e1a2921f48ed) Removed duplicate Socket declarations in kernel/file_system.cpp and fs.h - [`82285d5`](https://github.com/shadps4-emu/shadPS4/commit/82285d5ea40061ccf44f82db202ec5ca004b9ba1) Fixed clang-format and micDevice errors - [`e4c54f8`](https://github.com/shadps4-emu/shadPS4/commit/e4c54f811c9c2cd2259b48037558c85946e8471c) Ran clang-format and fixed rebase compiler issues - [`1a9872f`](https://github.com/shadps4-emu/shadPS4/commit/1a9872fc1ed5ebdcf3230290a32d994c768e82c1) Settings dialog fix - [`4ee4462`](https://github.com/shadps4-emu/shadPS4/commit/4ee44620f12f5bd802ed9e680a90619355bac282) Addressed squidbus' concerns ### 📊 Changes **12 files changed** (+304 additions, -106 deletions) <details> <summary>View changed files</summary> 📝 `src/common/config.cpp` (+42 -13) 📝 `src/common/config.h` (+5 -0) 📝 `src/core/libraries/audio/audioout.cpp` (+2 -2) 📝 `src/core/libraries/audio/audioout.h` (+1 -1) 📝 `src/core/libraries/audio/sdl_audio.cpp` (+39 -3) 📝 `src/qt_gui/gui_context_menus.h` (+2 -2) 📝 `src/qt_gui/main_window.cpp` (+4 -2) 📝 `src/qt_gui/sdl_event_wrapper.cpp` (+8 -0) 📝 `src/qt_gui/sdl_event_wrapper.h` (+1 -0) 📝 `src/qt_gui/settings_dialog.cpp` (+160 -73) 📝 `src/qt_gui/settings_dialog.h` (+10 -4) 📝 `src/qt_gui/settings_dialog.ui` (+30 -6) </details> ### 📄 Description A new PR with a proper rebase. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>