Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
rpcs3/Emu/Cell/Modules/cellMusic.cpp
+8 -2
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);
} }