mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-29 09:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use g_fxo for avconf_manager

Browse Source
This commit is contained in:
Nekotekina 2019-08-22 03:52:47 +03:00
parent 94dd6c2007
commit 6165bd68c0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp
View File

@ -149,7 +149,7 @@ s32 cellAudioInGetDeviceInfo(u32 deviceNumber, u32 deviceIndex, vm::ptr<CellAudi
{ {
cellAvconfExt.todo("cellAudioInGetDeviceInfo(deviceNumber=0x%x, deviceIndex=0x%x, info=*0x%x)", deviceNumber, deviceIndex, info); cellAvconfExt.todo("cellAudioInGetDeviceInfo(deviceNumber=0x%x, deviceIndex=0x%x, info=*0x%x)", deviceNumber, deviceIndex, info);
auto av_manager = fxm::get_always<avconf_manager>(); auto av_manager = g_fxo->get<avconf_manager>();
if (deviceNumber >= av_manager->devices.size()) if (deviceNumber >= av_manager->devices.size())
return CELL_AUDIO_OUT_ERROR_DEVICE_NOT_FOUND; return CELL_AUDIO_OUT_ERROR_DEVICE_NOT_FOUND;
@ -190,7 +190,7 @@ s32 cellAudioInGetAvailableDeviceInfo(u32 count, vm::ptr<CellAudioInDeviceInfo>
return CELL_AUDIO_IN_ERROR_ILLEGAL_PARAMETER; return CELL_AUDIO_IN_ERROR_ILLEGAL_PARAMETER;
} }
auto av_manager = fxm::get_always<avconf_manager>(); auto av_manager = g_fxo->get<avconf_manager>();
u32 num_devices_returned = std::min(count, (u32)av_manager->devices.size()); u32 num_devices_returned = std::min(count, (u32)av_manager->devices.size());