diff --git a/include/JSystem/JFramework/JFWSystem.h b/include/JSystem/JFramework/JFWSystem.h index bc302239e..5c20f1556 100644 --- a/include/JSystem/JFramework/JFWSystem.h +++ b/include/JSystem/JFramework/JFWSystem.h @@ -19,9 +19,9 @@ struct JFWSystem { static u32 fifoBufSize; static u32 aramAudioBufSize; static u32 aramGraphBufSize; - static u32 streamPriority; - static u32 decompPriority; - static u32 aPiecePriority; + static s32 streamPriority; + static s32 decompPriority; + static s32 aPiecePriority; static ResFONT* systemFontRes; static GXRenderModeObj* renderMode; static u32 exConsoleBufferSize; diff --git a/include/JSystem/JUtility/JUTGraphFifo.h b/include/JSystem/JUtility/JUTGraphFifo.h index aab9ae642..e0205a9fc 100644 --- a/include/JSystem/JUtility/JUTGraphFifo.h +++ b/include/JSystem/JUtility/JUTGraphFifo.h @@ -31,8 +31,8 @@ private: /* 0x10 */ u8 field_0x10[0xC]; }; -inline void JUTCreateFifo(u32 bufSize) { - new JUTGraphFifo(bufSize); +inline JUTGraphFifo* JUTCreateFifo(u32 bufSize) { + return new JUTGraphFifo(bufSize); } #endif /* JUTGRAPHFIFO_H */ diff --git a/src/JSystem/JFramework/JFWSystem.cpp b/src/JSystem/JFramework/JFWSystem.cpp index a1bdcfec9..35016adcb 100644 --- a/src/JSystem/JFramework/JFWSystem.cpp +++ b/src/JSystem/JFramework/JFWSystem.cpp @@ -26,9 +26,9 @@ u32 JFWSystem::CSetUpParam::sysHeapSize = 0x400000; u32 JFWSystem::CSetUpParam::fifoBufSize = 0x40000; u32 JFWSystem::CSetUpParam::aramAudioBufSize = 0x800000; u32 JFWSystem::CSetUpParam::aramGraphBufSize = 0x600000; -u32 JFWSystem::CSetUpParam::streamPriority = 8; -u32 JFWSystem::CSetUpParam::decompPriority = 7; -u32 JFWSystem::CSetUpParam::aPiecePriority = 6; +s32 JFWSystem::CSetUpParam::streamPriority = 8; +s32 JFWSystem::CSetUpParam::decompPriority = 7; +s32 JFWSystem::CSetUpParam::aPiecePriority = 6; ResFONT* JFWSystem::CSetUpParam::systemFontRes = (ResFONT*)JUTResFONT_Ascfont_fix12; GXRenderModeObj* JFWSystem::CSetUpParam::renderMode = &GXNtsc480IntDf; u32 JFWSystem::CSetUpParam::exConsoleBufferSize = 0x24F8; @@ -65,7 +65,9 @@ void JFWSystem::init() { sInitCalled = true; - JKRAram::create(CSetUpParam::aramAudioBufSize,CSetUpParam::aramGraphBufSize, CSetUpParam::streamPriority,CSetUpParam::decompPriority, CSetUpParam::aPiecePriority); + JKRAram::create(CSetUpParam::aramAudioBufSize, CSetUpParam::aramGraphBufSize, + CSetUpParam::streamPriority,CSetUpParam::decompPriority, + CSetUpParam::aPiecePriority); mainThread = new JKRThread(OSGetCurrentThread(), 4); JUTVideo::createManager(CSetUpParam::renderMode); diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 819e468ed..4385c7fa1 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -679,7 +679,7 @@ s16 mCaptureCenterY = 180; GXColor mCaptureMonoColor0 = { 0x00, 0x00, 0x00, 0x00 }; GXColor mCaptureMonoColor1 = { 0xFF, 0xFF, 0xFF, 0xFF }; u32 mCaptureThreadStackSize = 0x2000; -u32 mCaptureThreadPriority = 30; +s32 mCaptureThreadPriority = 30; /* 80009BBC-80009BE0 .text mCaptureAlarmHandler__FP7OSAlarmP9OSContext */ void mCaptureAlarmHandler(OSAlarm*, OSContext*) {