libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-29 11:20:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7514 from unknownbrackets/warnings

Browse Source 
Fix a few type comparison warnings
This commit is contained in:
Henrik Rydgård 2015-02-22 22:34:59 +01:00
commit 9489f80a46
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/HLE/sceAtrac.cpp
View File

@ -406,7 +406,7 @@ struct AtracResetBufferInfo {
const int PSP_NUM_ATRAC_IDS = 6;
static bool atracInited = true;
static Atrac *atracIDs[PSP_NUM_ATRAC_IDS];
static int atracIDTypes[PSP_NUM_ATRAC_IDS];
static u32 atracIDTypes[PSP_NUM_ATRAC_IDS];
void __AtracInit() {
atracInited = true;
@ -1547,7 +1547,7 @@ static u32 sceAtracSetData(int atracID, u32 buffer, u32 bufferSize) {
int ret = atrac->Analyze();
if (ret < 0) {
ERROR_LOG_REPORT(ME, "sceAtracSetData(%i, %08x, %08x): bad data", atracID, buffer, bufferSize);
} else if ((int)atrac->codecType != atracIDTypes[atracID]) {
} else if (atrac->codecType != atracIDTypes[atracID]) {
ERROR_LOG_REPORT(ME, "sceAtracSetData(%i, %08x, %08x): atracID uses different codec type than data", atracID, buffer, bufferSize);
ret = ATRAC_ERROR_WRONG_CODECTYPE;
} else {

2
Core/HW/StereoResampler.cpp
View File

@ -91,7 +91,7 @@ unsigned int StereoResampler::MixerFifo::Mix(short* samples, unsigned int numSam
u32 indexW = Common::AtomicLoad(m_indexW);
// We force on the audio resampler if the output sample rate doesn't match the input.
if (!g_Config.bAudioResampler && sample_rate == m_input_sample_rate) {
if (!g_Config.bAudioResampler && sample_rate == (int)m_input_sample_rate) {
for (; currentSample < numSamples * 2 && ((indexW - indexR) & INDEX_MASK) > 2; currentSample += 2) {
u32 indexR2 = indexR + 2; //next sample
s16 l1 = m_buffer[indexR & INDEX_MASK]; //current

2
UI/BackgroundAudio.cpp
View File

@ -208,7 +208,7 @@ int PlayBackgroundAudio() {
double now = time_now();
if (at3Reader) {
const int sz = (now - lastPlaybackTime) * 44100;
if (sz >= 16 && sz < ARRAY_SIZE(buffer)/2) {
if (sz >= 16 && sz < (int)ARRAY_SIZE(buffer) / 2) {
if (at3Reader->Read(buffer, sz))
__PushExternalAudio(buffer, sz);
}

2
native

@ -1 +1 @@
Subproject commit d2acef3a3b15683d553a593d1c4ca3decd3b0c41
Subproject commit 5f863cbbe8e9d90b1b07f7d0b87788ba7cbc2053