From a5317d50a574c27579a27fa04bca786d624fa2bc Mon Sep 17 00:00:00 2001 From: Megamouse Date: Fri, 22 Jul 2022 10:19:25 +0200 Subject: [PATCH] cellMusicSelectionContext: log playlist --- rpcs3/Emu/Cell/Modules/cellMusic.cpp | 5 ++--- rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp | 5 ++--- rpcs3/Emu/Cell/Modules/cellMusicSelectionContext.cpp | 9 ++++++++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellMusic.cpp b/rpcs3/Emu/Cell/Modules/cellMusic.cpp index f35fdda01a..4acb535c73 100644 --- a/rpcs3/Emu/Cell/Modules/cellMusic.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMusic.cpp @@ -109,14 +109,13 @@ error_code cell_music_select_contents() if (!music.func) return CELL_MUSIC_ERROR_GENERIC; - const std::string dir_path = "/dev_hdd0/music"; const std::string vfs_dir_path = vfs::get("/dev_hdd0/music"); const std::string title = get_localized_string(localized_string_id::RSX_OVERLAYS_MEDIA_DIALOG_TITLE); error_code error = rsx::overlays::show_media_list_dialog(rsx::overlays::media_list_dialog::media_type::audio, vfs_dir_path, title, - [&music, dir_path, vfs_dir_path](s32 status, utils::media_info info) + [&music](s32 status, utils::media_info info) { - sysutil_register_cb([&music, dir_path, vfs_dir_path, info, status](ppu_thread& ppu) -> s32 + sysutil_register_cb([&music, info, status](ppu_thread& ppu) -> s32 { std::lock_guard lock(music.mtx); const u32 result = status >= 0 ? u32{CELL_OK} : u32{CELL_MUSIC_CANCELED}; diff --git a/rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp b/rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp index 66f52680bc..091ae51b87 100644 --- a/rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp @@ -134,14 +134,13 @@ error_code cell_music_decode_select_contents() if (!dec.func) return CELL_MUSIC_DECODE_ERROR_GENERIC; - const std::string dir_path = "/dev_hdd0/music"; const std::string vfs_dir_path = vfs::get("/dev_hdd0/music"); const std::string title = get_localized_string(localized_string_id::RSX_OVERLAYS_MEDIA_DIALOG_TITLE); error_code error = rsx::overlays::show_media_list_dialog(rsx::overlays::media_list_dialog::media_type::audio, vfs_dir_path, title, - [&dec, dir_path, vfs_dir_path](s32 status, utils::media_info info) + [&dec](s32 status, utils::media_info info) { - sysutil_register_cb([&dec, dir_path, vfs_dir_path, info, status](ppu_thread& ppu) -> s32 + sysutil_register_cb([&dec, info, status](ppu_thread& ppu) -> s32 { std::lock_guard lock(dec.mutex); const u32 result = status >= 0 ? u32{CELL_OK} : u32{CELL_MUSIC_DECODE_CANCELED}; diff --git a/rpcs3/Emu/Cell/Modules/cellMusicSelectionContext.cpp b/rpcs3/Emu/Cell/Modules/cellMusicSelectionContext.cpp index 376d673b2c..1ab99f0e47 100644 --- a/rpcs3/Emu/Cell/Modules/cellMusicSelectionContext.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMusicSelectionContext.cpp @@ -42,8 +42,15 @@ CellMusicSelectionContext music_selection_context::get() const std::string music_selection_context::to_string() const { - return fmt::format("{ .magic='%s', .content_type=%d, .repeat_mode=%d, .context_option=%d, .first_track=%d, .tracks=%d, .hash='%s' }", + std::string str = fmt::format(".magic='%s', .content_type=%d, .repeat_mode=%d, .context_option=%d, .first_track=%d, .tracks=%d, .hash='%s', .playlist:", magic, static_cast(content_type), static_cast(repeat_mode), static_cast(context_option), first_track, playlist.size(), hash); + + for (usz i = 0; i < playlist.size(); i++) + { + fmt::append(str, "\ - Track %d: %s", i, playlist.at(i)); + } + + return str; } std::string music_selection_context::get_next_hash()