mirror of
https://github.com/RPCS3/rpcs3.git
synced 2024-11-22 18:53:28 +01:00
move cellSysutilAvc2LoadAsync to cellSysutilAvc2Load
This commit is contained in:
parent
bbd81b9395
commit
682fd15441
@ -254,28 +254,6 @@ error_code cellSysutilAvc2GetAttribute(vm::ptr<CellSysutilAvc2Attribute> attr)
|
|||||||
return CELL_OK;
|
return CELL_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
error_code cellSysutilAvc2LoadAsync(SceNpMatching2ContextId ctx_id, u32 container, vm::ptr<CellSysutilAvc2Callback> callback_func, vm::ptr<void> user_data, vm::cptr<CellSysutilAvc2InitParam> init_param)
|
|
||||||
{
|
|
||||||
cellSysutilAvc2.warning("cellSysutilAvc2LoadAsync(ctx_id=0x%x, container=0x%x, callback_func=*0x%x, user_data=*0x%x, init_param=*0x%x)", ctx_id, container, callback_func, user_data, init_param);
|
|
||||||
|
|
||||||
error_code error = cellSysutilAvc2Load_shared(ctx_id, container, callback_func, user_data, init_param);
|
|
||||||
if (error != CELL_OK)
|
|
||||||
return error;
|
|
||||||
|
|
||||||
auto& settings = g_fxo->get<avc2_settings>();
|
|
||||||
|
|
||||||
if (settings.avc2_cb)
|
|
||||||
{
|
|
||||||
sysutil_register_cb([=, avc2_cb = settings.avc2_cb, avc2_cb_arg = settings.avc2_cb_arg](ppu_thread& cb_ppu) -> s32
|
|
||||||
{
|
|
||||||
avc2_cb(cb_ppu, CELL_AVC2_EVENT_LOAD_SUCCEEDED, 0, avc2_cb_arg);
|
|
||||||
return 0;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return CELL_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
error_code cellSysutilAvc2SetSpeakerVolumeLevel(f32 level)
|
error_code cellSysutilAvc2SetSpeakerVolumeLevel(f32 level)
|
||||||
{
|
{
|
||||||
cellSysutilAvc2.todo("cellSysutilAvc2SetSpeakerVolumeLevel(level=0x%x)", level);
|
cellSysutilAvc2.todo("cellSysutilAvc2SetSpeakerVolumeLevel(level=0x%x)", level);
|
||||||
@ -881,6 +859,28 @@ error_code cellSysutilAvc2Load(SceNpMatching2ContextId ctx_id, u32 container, vm
|
|||||||
return CELL_OK;
|
return CELL_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
error_code cellSysutilAvc2LoadAsync(SceNpMatching2ContextId ctx_id, u32 container, vm::ptr<CellSysutilAvc2Callback> callback_func, vm::ptr<void> user_data, vm::cptr<CellSysutilAvc2InitParam> init_param)
|
||||||
|
{
|
||||||
|
cellSysutilAvc2.warning("cellSysutilAvc2LoadAsync(ctx_id=0x%x, container=0x%x, callback_func=*0x%x, user_data=*0x%x, init_param=*0x%x)", ctx_id, container, callback_func, user_data, init_param);
|
||||||
|
|
||||||
|
error_code error = cellSysutilAvc2Load_shared(ctx_id, container, callback_func, user_data, init_param);
|
||||||
|
if (error != CELL_OK)
|
||||||
|
return error;
|
||||||
|
|
||||||
|
auto& settings = g_fxo->get<avc2_settings>();
|
||||||
|
|
||||||
|
if (settings.avc2_cb)
|
||||||
|
{
|
||||||
|
sysutil_register_cb([=, avc2_cb = settings.avc2_cb, avc2_cb_arg = settings.avc2_cb_arg](ppu_thread& cb_ppu) -> s32
|
||||||
|
{
|
||||||
|
avc2_cb(cb_ppu, CELL_AVC2_EVENT_LOAD_SUCCEEDED, 0, avc2_cb_arg);
|
||||||
|
return 0;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return CELL_OK;
|
||||||
|
}
|
||||||
|
|
||||||
error_code cellSysutilAvc2SetAttribute(vm::cptr<CellSysutilAvc2Attribute> attr)
|
error_code cellSysutilAvc2SetAttribute(vm::cptr<CellSysutilAvc2Attribute> attr)
|
||||||
{
|
{
|
||||||
if (!attr)
|
if (!attr)
|
||||||
|
Loading…
Reference in New Issue
Block a user