diff options
Diffstat (limited to 'src/JSystem')
| -rw-r--r-- | src/JSystem/JAudio2/JASAudioThread.cpp | 2 | ||||
| -rw-r--r-- | src/JSystem/JAudio2/JASCalc.cpp | 8 | ||||
| -rw-r--r-- | src/JSystem/JKernel/JKRAssertHeap.cpp | 2 | ||||
| -rw-r--r-- | src/JSystem/JStudio/JStudio/fvb.cpp | 2 | ||||
| -rw-r--r-- | src/JSystem/JStudio/JStudio/stb.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/JSystem/JAudio2/JASAudioThread.cpp b/src/JSystem/JAudio2/JASAudioThread.cpp index 2aa71a329f..e689a9607f 100644 --- a/src/JSystem/JAudio2/JASAudioThread.cpp +++ b/src/JSystem/JAudio2/JASAudioThread.cpp @@ -19,7 +19,7 @@ JASAudioThread::JASAudioThread(int stackSize, int msgCount, u32 threadPriority) OSInitThreadQueue(&sThreadQueue); } -void JASAudioThread::create(long threadPriority) { +void JASAudioThread::create(s32 threadPriority) { JASAudioThread* sAudioThread = new (JASDram, 0) JASAudioThread(threadPriority, 0x10, 0x1400); sAudioThread->setCurrentHeap(JKRGetSystemHeap()); sAudioThread->resume(); diff --git a/src/JSystem/JAudio2/JASCalc.cpp b/src/JSystem/JAudio2/JASCalc.cpp index a076cef9d1..861b8dcd67 100644 --- a/src/JSystem/JAudio2/JASCalc.cpp +++ b/src/JSystem/JAudio2/JASCalc.cpp @@ -264,11 +264,11 @@ s16 const JASCalc::CUTOFF_TO_IIR_TABLE[128][4] = { }; // currently required because of missing functions -// JASCalc::hannWindow(short *, unsigned long) -// JASCalc::hammWindow(short *, unsigned long) -// JASCalc::fft(float *, float *, unsigned long, long) +// JASCalc::hannWindow(short *, u32) +// JASCalc::hammWindow(short *, u32) +// JASCalc::fft(float *, float *, u32, s32) f32 JASCalc::fake1() { return 0.5f; } -f32 JASCalc::fake2(long x) { return JASCalc::clamp<s16, long>(x); } +f32 JASCalc::fake2(s32 x) { return JASCalc::clamp<s16, s32>(x); } f32 JASCalc::fake3() { return 0.0f; } f32 JASCalc::pow2(f32 x) { diff --git a/src/JSystem/JKernel/JKRAssertHeap.cpp b/src/JSystem/JKernel/JKRAssertHeap.cpp index d38ff3b909..5a3d723340 100644 --- a/src/JSystem/JKernel/JKRAssertHeap.cpp +++ b/src/JSystem/JKernel/JKRAssertHeap.cpp @@ -2,7 +2,7 @@ #include "JSystem/JKernel/JKRAssertHeap.h" -JKRAssertHeap::JKRAssertHeap(void* data, unsigned long size, JKRHeap* parent, bool errorFlag) +JKRAssertHeap::JKRAssertHeap(void* data, u32 size, JKRHeap* parent, bool errorFlag) : JKRHeap(data, size, parent, errorFlag) {} JKRAssertHeap::~JKRAssertHeap() { diff --git a/src/JSystem/JStudio/JStudio/fvb.cpp b/src/JSystem/JStudio/JStudio/fvb.cpp index f3500035b9..b2922f2be3 100644 --- a/src/JSystem/JStudio/JStudio/fvb.cpp +++ b/src/JSystem/JStudio/JStudio/fvb.cpp @@ -404,7 +404,7 @@ bool TParse::parseHeader_next(void const** ppData_inout, u32* puBlock_out, u32 f u16 version = header.get_version(); if (version < 2) { JUTWarn w; - w << "obselete version : " << (long)0; + w << "obselete version : " << (s32)0; return false; } else if (version > 0x100) { JUTWarn w; diff --git a/src/JSystem/JStudio/JStudio/stb.cpp b/src/JSystem/JStudio/JStudio/stb.cpp index 6a2f6515c7..c7270facf1 100644 --- a/src/JSystem/JStudio/JStudio/stb.cpp +++ b/src/JSystem/JStudio/JStudio/stb.cpp @@ -405,7 +405,7 @@ bool TParse::parseHeader_next(const void** ppData_inout, u32* puBlock_out, u32 f u16 version = header.get_version(); if (version < 1) { JUTWarn w; - w << "obselete version : " << (long)0; + w << "obselete version : " << (s32)0; return false; } else if (version > 3) { JUTWarn w; |
