diff --git a/externals/SDL b/externals/SDL index c60e270..e1e36d2 160000 --- a/externals/SDL +++ b/externals/SDL @@ -1 +1 @@ -Subproject commit c60e2704c88ecb8bf55d69085b9c1bd2a68e5321 +Subproject commit e1e36d213bea3a0b56d91b454c53a2c94312a5be diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt index 8af1e0d..f9de61b 100644 --- a/externals/ffmpeg/CMakeLists.txt +++ b/externals/ffmpeg/CMakeLists.txt @@ -254,7 +254,7 @@ elseif(ANDROID) set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE) elseif(WIN32) # Use sudachi FFmpeg binaries - set(FFmpeg_EXT_NAME "ffmpeg-6.0") + set(FFmpeg_EXT_NAME "ffmpeg-7.0") set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}") download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "") set(FFmpeg_FOUND YES) diff --git a/externals/ffmpeg/ffmpeg b/externals/ffmpeg/ffmpeg index e0db1f5..cc6fb16 160000 --- a/externals/ffmpeg/ffmpeg +++ b/externals/ffmpeg/ffmpeg @@ -1 +1 @@ -Subproject commit e0db1f51d6ddf9eb2c1314c23d063a29255b607a +Subproject commit cc6fb1643d7e14c6f76a48e0cffad96394cb197c diff --git a/src/common/microprofile.h b/src/common/microprofile.h index 0614ac7..a14d74a 100644 --- a/src/common/microprofile.h +++ b/src/common/microprofile.h @@ -5,7 +5,11 @@ // Uncomment this to disable microprofile. This will get you cleaner profiles when using // external sampling profilers like "Very Sleepy", and will improve performance somewhat. +#ifdef _DEBUG +#define MICROPROFILE_ENABLED 1 +#else #define MICROPROFILE_ENABLED 0 +#endif // Customized Citra settings. // This file wraps the MicroProfile header so that these are consistent everywhere. @@ -20,7 +24,11 @@ typedef void* HANDLE; #endif #if MICROPROFILE_ENABLED == 0 -#define MicroProfileOnThreadExit __noop +#ifdef _WIN32 +#define MicroProfileOnThreadExit() __noop +#else +#define MicroProfileOnThreadExit() 0 +#endif #endif #include diff --git a/src/core/hle/service/mm/mm_u.cpp b/src/core/hle/service/mm/mm_u.cpp index e639bef..41a2d27 100644 --- a/src/core/hle/service/mm/mm_u.cpp +++ b/src/core/hle/service/mm/mm_u.cpp @@ -30,7 +30,7 @@ public: private: void InitializeOld(HLERequestContext& ctx) { - LOG_WARNING(Service_MM, "(STUBBED) called."); + LOG_DEBUG(Service_MM, "(STUBBED) called."); IPC::RequestParser rp{ctx}; module = rp.PopEnum(); @@ -42,7 +42,7 @@ private: } void FinalizeOld(HLERequestContext& ctx) { - LOG_WARNING(Service_MM, "(STUBBED) called."); + LOG_DEBUG(Service_MM, "(STUBBED) called."); IPC::RequestParser rp{ctx}; module = rp.PopEnum(); @@ -52,7 +52,7 @@ private: } void SetAndWaitOld(HLERequestContext& ctx) { - LOG_WARNING(Service_MM, "(STUBBED) called."); + LOG_DEBUG(Service_MM, "(STUBBED) called."); IPC::RequestParser rp{ctx}; module = rp.PopEnum(); @@ -65,7 +65,7 @@ private: } void GetOld(HLERequestContext& ctx) { - LOG_WARNING(Service_MM, "(STUBBED) called."); + LOG_DEBUG(Service_MM, "(STUBBED) called."); IPC::RequestParser rp{ctx}; module = rp.PopEnum(); @@ -76,7 +76,7 @@ private: } void Initialize(HLERequestContext& ctx) { - LOG_WARNING(Service_MM, "(STUBBED) called."); + LOG_DEBUG(Service_MM, "(STUBBED) called."); IPC::RequestParser rp{ctx}; module = rp.PopEnum(); @@ -89,7 +89,7 @@ private: } void Finalize(HLERequestContext& ctx) { - LOG_WARNING(Service_MM, "(STUBBED) called."); + LOG_DEBUG(Service_MM, "(STUBBED) called."); IPC::RequestParser rp{ctx}; request_id = rp.Pop(); @@ -99,7 +99,7 @@ private: } void SetAndWait(HLERequestContext& ctx) { - LOG_WARNING(Service_MM, "(STUBBED) called."); + LOG_DEBUG(Service_MM, "(STUBBED) called."); IPC::RequestParser rp{ctx}; request_id = rp.Pop(); @@ -112,7 +112,7 @@ private: } void Get(HLERequestContext& ctx) { - LOG_WARNING(Service_MM, "(STUBBED) called."); + LOG_DEBUG(Service_MM, "(STUBBED) called."); IPC::RequestParser rp{ctx}; request_id = rp.Pop();