archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 14:31:24 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

cellMusic

Browse source
This commit is contained in:
Megamouse 2024-02-16 09:54:55 +01:00
parent dff7352e2e
commit 14e9c8954c
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpcs3/Emu/Cell/Modules/cellMusic.cpp
View file

@ -250,7 +250,7 @@ error_code cellMusicGetSelectionContext(vm::ptr<CellMusicSelectionContext> conte
if (!music.current_selection_context) if (!music.current_selection_context)
{ {
return CELL_MUSIC2_ERROR_NO_ACTIVE_CONTENT; return CELL_MUSIC_ERROR_NO_ACTIVE_CONTENT;
} }
*context = music.current_selection_context.get(); *context = music.current_selection_context.get();
@ -325,7 +325,7 @@ error_code cellMusicGetContentsId(vm::ptr<CellSearchContentId> contents_id)
if (!music.current_selection_context) if (!music.current_selection_context)
{ {
return CELL_MUSIC2_ERROR_NO_ACTIVE_CONTENT; return CELL_MUSIC_ERROR_NO_ACTIVE_CONTENT;
} }
return music.current_selection_context.find_content_id(contents_id); return music.current_selection_context.find_content_id(contents_id);
@ -408,6 +408,12 @@ error_code cellMusicGetContentsId2(vm::ptr<CellSearchContentId> contents_id)
// HACKY // HACKY
auto& music = g_fxo->get<music_state>(); auto& music = g_fxo->get<music_state>();
std::lock_guard lock(music.mtx); std::lock_guard lock(music.mtx);
if (!music.current_selection_context)
{
return CELL_MUSIC2_ERROR_NO_ACTIVE_CONTENT;
}
return music.current_selection_context.find_content_id(contents_id); return music.current_selection_context.find_content_id(contents_id);
} }