mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-09 00:11:24 +12:00
Conflicts fixed
This commit is contained in:
commit
c6c6dbe546
102 changed files with 3039 additions and 3008 deletions
|
@ -911,6 +911,19 @@ int cellHddGameCheck(u32 version, u32 dirName_addr, u32 errDialog, mem_func_ptr_
|
|||
return CELL_OK;
|
||||
}
|
||||
|
||||
int cellSysutilGetBgmPlaybackStatus(mem_ptr_t<CellBgmPlaybackStatus> status)
|
||||
{
|
||||
cellSysutil.Warning("cellSysutilGetBgmPlaybackStatus(status=0x%x)", status.GetAddr());
|
||||
|
||||
// non-essential, so always assume background music is stopped/disabled
|
||||
status->playbackState = CELL_BGMPLAYBACK_STATUS_STOP;
|
||||
status->enabled = CELL_BGMPLAYBACK_STATUS_DISABLE;
|
||||
status->fadeRatio = 0; // volume ratio
|
||||
memset(status->contentId, 0, sizeof(status->contentId));
|
||||
|
||||
return CELL_OK;
|
||||
}
|
||||
|
||||
void cellSysutil_init()
|
||||
{
|
||||
cellSysutil.AddFunc(0x40e895d3, cellSysutilGetSystemParamInt);
|
||||
|
@ -940,6 +953,8 @@ void cellSysutil_init()
|
|||
cellSysutil.AddFunc(0xed5d96af, cellAudioOutGetConfiguration);
|
||||
cellSysutil.AddFunc(0xc96e89e9, cellAudioOutSetCopyControl);
|
||||
|
||||
cellSysutil.AddFunc(0xa11552f6, cellSysutilGetBgmPlaybackStatus);
|
||||
|
||||
cellSysutil.AddFunc(0x1e7bff94, cellSysCacheMount);
|
||||
cellSysutil.AddFunc(0x744c1544, cellSysCacheClear);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue