mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-06 00:40:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

cellAudioOutGetConfigure: Store and return set config seperately

Browse Source
This commit is contained in:
Megamouse 2022-06-04 12:18:45 +02:00
parent 8c0a786918
commit 15be6827ea
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rpcs3/Emu/Cell/Modules/cellAudioOut.cpp
View File

@ -78,6 +78,15 @@ audio_out_configuration::audio_out_configuration()
primary_output.encoder = primary_modes.front().type; primary_output.encoder = primary_modes.front().type;
secondary_output.channels = secondary_modes.front().channel; secondary_output.channels = secondary_modes.front().channel;
secondary_output.encoder = secondary_modes.front().type; secondary_output.encoder = secondary_modes.front().type;
// Set the initially selected configuration
primary_output.config.channel = primary_output.channels;
primary_output.config.encoder = primary_output.encoder;
primary_output.config.downMixer = CELL_AUDIO_OUT_DOWNMIXER_NONE;
secondary_output.config.channel = secondary_output.channels;
secondary_output.config.encoder = secondary_output.encoder;
secondary_output.config.downMixer = CELL_AUDIO_OUT_DOWNMIXER_NONE;
initial_mode_selected = true; initial_mode_selected = true;
} }
}; };
@ -344,6 +353,9 @@ error_code cellAudioOutConfigure(u32 audioOut, vm::ptr<CellAudioOutConfiguration
needs_reset = true; needs_reset = true;
} }
// Apparently the set config is not necessarily equal to the active config, so we need to store it seperately.
out.config = *config;
} }
if (needs_reset) if (needs_reset)
@ -402,14 +414,11 @@ error_code cellAudioOutGetConfiguration(u32 audioOut, vm::ptr<CellAudioOutConfig
audio_out_configuration& cfg = g_fxo->get<audio_out_configuration>(); audio_out_configuration& cfg = g_fxo->get<audio_out_configuration>();
std::lock_guard lock(cfg.mtx); std::lock_guard lock(cfg.mtx);
CellAudioOutConfiguration _config{};
const audio_out_configuration::audio_out& out = cfg.out.at(audioOut); const audio_out_configuration::audio_out& out = cfg.out.at(audioOut);
_config.channel = out.channels;
_config.encoder = out.encoder;
_config.downMixer = out.downmixer;
*config = _config; // Return the set config, which might not necessarily be the active config.
*config = out.config;
return CELL_OK; return CELL_OK;
} }

1
rpcs3/Emu/Cell/Modules/cellAudioOut.h
View File

@ -202,6 +202,7 @@ struct audio_out_configuration
u32 downmixer = CELL_AUDIO_OUT_DOWNMIXER_NONE; u32 downmixer = CELL_AUDIO_OUT_DOWNMIXER_NONE;
u32 copy_control = CELL_AUDIO_OUT_COPY_CONTROL_COPY_FREE; u32 copy_control = CELL_AUDIO_OUT_COPY_CONTROL_COPY_FREE;
std::vector<CellAudioOutSoundMode> sound_modes; std::vector<CellAudioOutSoundMode> sound_modes;
CellAudioOutConfiguration config{}; // Selected by the game. Does not necessarily mean the active config.
}; };
std::array<audio_out, 2> out; std::array<audio_out, 2> out;