Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-06 22:25:41 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #629 from wheremyfoodat/more-dsp

Browse source 
Remember window positions in SDL & turn on AAC decoder by default
This commit is contained in:
wheremyfoodat 2024-11-02 22:51:46 +02:00 • committed by GitHub
commit 4b0591c9ea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/audio/hle_core.cpp
View file

@ -643,8 +643,8 @@ namespace Audio {
response.command = request.command; response.command = request.command;
response.mode = request.mode; response.mode = request.mode;
// TODO: Make this a toggle in config.toml. Currently we have it off by default until we finish the DSP mixer. // TODO: Make this a toggle in config.toml. Currently we have it on by default.
constexpr bool enableAAC = false; constexpr bool enableAAC = true;
if (enableAAC) { if (enableAAC) {
aacDecoder->decode(response, request, [this](u32 paddr) { return getPointerPhys<u8>(paddr); }); aacDecoder->decode(response, request, [this](u32 paddr) { return getPointerPhys<u8>(paddr); });
} }

15
src/panda_sdl/frontend_sdl.cpp
View file

@ -40,11 +40,18 @@ FrontendSDL::FrontendSDL() : keyboardMappings(InputMappings::defaultKeyboardMapp
printf("Welcome to Panda3DS v%s!\n", PANDA3DS_VERSION); printf("Welcome to Panda3DS v%s!\n", PANDA3DS_VERSION);
} }
// Positions of the window
int windowX, windowY;
// Apply window size settings if the appropriate option is enabled // Apply window size settings if the appropriate option is enabled
if (config.windowSettings.rememberPosition) { if (config.windowSettings.rememberPosition) {
windowX = config.windowSettings.x;
windowY = config.windowSettings.y;
windowWidth = config.windowSettings.width; windowWidth = config.windowSettings.width;
windowHeight = config.windowSettings.height; windowHeight = config.windowSettings.height;
} else { } else {
windowX = SDL_WINDOWPOS_CENTERED;
windowY = SDL_WINDOWPOS_CENTERED;
windowWidth = 400; windowWidth = 400;
windowHeight = 480; windowHeight = 480;
} }
@ -56,7 +63,7 @@ FrontendSDL::FrontendSDL() : keyboardMappings(InputMappings::defaultKeyboardMapp
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE); SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, config.rendererType == RendererType::Software ? 3 : 4); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, config.rendererType == RendererType::Software ? 3 : 4);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, config.rendererType == RendererType::Software ? 3 : 1); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, config.rendererType == RendererType::Software ? 3 : 1);
window = SDL_CreateWindow(windowTitle, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, windowWidth, windowHeight, SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE); window = SDL_CreateWindow(windowTitle, windowX, windowY, windowWidth, windowHeight, SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE);
if (window == nullptr) { if (window == nullptr) {
Helpers::panic("Window creation failed: %s", SDL_GetError()); Helpers::panic("Window creation failed: %s", SDL_GetError());
@ -76,9 +83,7 @@ FrontendSDL::FrontendSDL() : keyboardMappings(InputMappings::defaultKeyboardMapp
#ifdef PANDA3DS_ENABLE_VULKAN #ifdef PANDA3DS_ENABLE_VULKAN
if (config.rendererType == RendererType::Vulkan) { if (config.rendererType == RendererType::Vulkan) {
window = SDL_CreateWindow( window = SDL_CreateWindow(windowTitle, windowX, windowY, windowWidth, windowHeight, SDL_WINDOW_VULKAN | SDL_WINDOW_RESIZABLE);
windowTitle, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, windowWidth, windowHeight, SDL_WINDOW_VULKAN | SDL_WINDOW_RESIZABLE
);
if (window == nullptr) { if (window == nullptr) {
Helpers::warn("Window creation failed: %s", SDL_GetError()); Helpers::warn("Window creation failed: %s", SDL_GetError());
@ -116,8 +121,6 @@ void FrontendSDL::run() {
// Remember window position & size for future runs // Remember window position & size for future runs
auto& windowSettings = emu.getConfig().windowSettings; auto& windowSettings = emu.getConfig().windowSettings;
// Note: For the time being we currently don't actually apply the x/y positions to the window, and center it instead
// This is subject to change in the future, so let's save the x/y positions to the config file anyways
SDL_GetWindowPosition(window, &windowSettings.x, &windowSettings.y); SDL_GetWindowPosition(window, &windowSettings.x, &windowSettings.y);
SDL_GetWindowSize(window, &windowSettings.width, &windowSettings.height); SDL_GetWindowSize(window, &windowSettings.width, &windowSettings.height);
return; return;