From e95f55a5fe3cc52ebfd5c05124dda12de6ed4722 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 19 Oct 2013 14:02:47 -0700 Subject: [PATCH] Fix some enum type warnings. --- Core/FileSystems/DirectoryFileSystem.cpp | 2 +- Core/HLE/sceAtrac.cpp | 2 +- Core/HLE/scePsmf.cpp | 4 ++-- Core/HW/SasAudio.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Core/FileSystems/DirectoryFileSystem.cpp b/Core/FileSystems/DirectoryFileSystem.cpp index 21fdcde10f..ea1efe6545 100644 --- a/Core/FileSystems/DirectoryFileSystem.cpp +++ b/Core/FileSystems/DirectoryFileSystem.cpp @@ -416,7 +416,7 @@ int DirectoryFileSystem::RenameFile(const std::string &from, const std::string & #endif // TODO: Better error codes. - return retValue ? 0 : SCE_KERNEL_ERROR_ERRNO_FILE_ALREADY_EXISTS; + return retValue ? 0 : (int)SCE_KERNEL_ERROR_ERRNO_FILE_ALREADY_EXISTS; } bool DirectoryFileSystem::RemoveFile(const std::string &filename) { diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 560e775396..3f132b9e05 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -1296,7 +1296,7 @@ int sceAtracReinit(int at3Count, int at3plusCount) } // If we ran out of space, we still initialize some, but return an error. - int result = space >= 0 ? 0 : SCE_KERNEL_ERROR_OUT_OF_MEMORY; + int result = space >= 0 ? 0 : (int)SCE_KERNEL_ERROR_OUT_OF_MEMORY; if (atracInited || next == 0) { INFO_LOG(ME, "sceAtracReinit(%d, %d)", at3Count, at3plusCount); atracInited = true; diff --git a/Core/HLE/scePsmf.cpp b/Core/HLE/scePsmf.cpp index d2e5a9dbc3..e65c065edd 100644 --- a/Core/HLE/scePsmf.cpp +++ b/Core/HLE/scePsmf.cpp @@ -1027,7 +1027,7 @@ int scePsmfPlayerGetVideoData(u32 psmfPlayer, u32 videoDataAddr) } _PsmfPlayerFillRingbuffer(psmfplayer); - int ret = psmfplayer->mediaengine->IsVideoEnd() ? ERROR_PSMFPLAYER_NO_MORE_DATA : 0; + int ret = psmfplayer->mediaengine->IsVideoEnd() ? (int)ERROR_PSMFPLAYER_NO_MORE_DATA : 0; s64 deltapts = psmfplayer->mediaengine->getVideoTimeStamp() - psmfplayer->mediaengine->getAudioTimeStamp(); int delaytime = 3000; @@ -1052,7 +1052,7 @@ int scePsmfPlayerGetAudioData(u32 psmfPlayer, u32 audioDataAddr) Memory::Memset(audioDataAddr, 0, audioSamplesBytes); psmfplayer->mediaengine->getAudioSamples(Memory::GetPointer(audioDataAddr)); } - int ret = psmfplayer->mediaengine->IsNoAudioData() ? ERROR_PSMFPLAYER_NO_MORE_DATA : 0; + int ret = psmfplayer->mediaengine->IsNoAudioData() ? (int)ERROR_PSMFPLAYER_NO_MORE_DATA : 0; return hleDelayResult(ret, "psmfPlayer audio decode", 3000); } diff --git a/Core/HW/SasAudio.h b/Core/HW/SasAudio.h index 98edae70f6..0463bc3abf 100644 --- a/Core/HW/SasAudio.h +++ b/Core/HW/SasAudio.h @@ -137,7 +137,7 @@ public: void Step(); int GetHeight() const { - return height_ > PSP_SAS_ENVELOPE_HEIGHT_MAX ? PSP_SAS_ENVELOPE_HEIGHT_MAX : height_; + return height_ > (s64)PSP_SAS_ENVELOPE_HEIGHT_MAX ? (s64)PSP_SAS_ENVELOPE_HEIGHT_MAX : height_; } bool HasEnded() const { return state_ == STATE_OFF;