Assorted warning fixes, small mixer improvement when both DTK and HLE audio are used

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1100 8ced0084-cf51-0410-be5f-012b33b47a6e

5 files changed, 5 insertions, 4 deletions

diff --git a/Source/Core/Common/Src/CPUDetect.cpp b/Source/Core/Common/Src/CPUDetect.cpp
index 514a3c6b9c..062cdfbbbf 100644
--- a/Source/Core/Common/Src/CPUDetect.cpp
+++ b/Source/Core/Common/Src/CPUDetect.cpp
@@ -14,6 +14,7 @@
 

 // Official SVN repository and contact information can be found at

 // http://code.google.com/p/dolphin-emu/

+

 #include <memory.h>

 

 #ifdef _WIN32

diff --git a/Source/Core/Common/Src/ChunkFile.h b/Source/Core/Common/Src/ChunkFile.h
index 7d3aa35b93..985504571f 100644
--- a/Source/Core/Common/Src/ChunkFile.h
+++ b/Source/Core/Common/Src/ChunkFile.h
@@ -92,7 +92,7 @@ public:
 	// Store strings.

 	void Do(std::string &x) 

 	{

-		int stringLen = x.length() + 1;

+		int stringLen = (int)x.length() + 1;

 		Do(stringLen);

 

 		switch (mode)

diff --git a/Source/Core/Core/Src/HLE/HLE.cpp b/Source/Core/Core/Src/HLE/HLE.cpp
index 3be984d9ab..c186a55e4d 100644
--- a/Source/Core/Core/Src/HLE/HLE.cpp
+++ b/Source/Core/Core/Src/HLE/HLE.cpp
@@ -104,7 +104,7 @@ void PatchFunctions()
 		if (symbol > 0)

 		{

 			u32 HLEPatchValue = (1 & 0x3f) << 26;

-			for (size_t addr = symbol->address; addr < symbol->address + symbol->size; addr += 4)

+			for (u32 addr = symbol->address; addr < symbol->address + symbol->size; addr += 4)

 				Memory::Write_U32(HLEPatchValue | i, addr);

 			LOG(HLE,"Patching %s %08x", OSPatches[i].m_szPatchName, symbol->address);

 		}

diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
index 8e6003e253..532f229b89 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
@@ -149,7 +149,7 @@ CWII_IPC_HLE_Device_FileIO::Read(u32 _CommandAddress)
     if (m_pFileHandle != NULL)

     {

         size_t readItems = fread(Memory::GetPointer(Address), 1, Size, m_pFileHandle);

-        ReturnValue = readItems;

+        ReturnValue = (u32)readItems;

         LOG(WII_IPC_FILEIO, "FileIO reads from %s (Addr=0x%08x Size=0x%x)", GetDeviceName().c_str(), Address, Size);	

     }

     else

diff --git a/Source/Core/DiscIO/Src/CompressedBlob.cpp b/Source/Core/DiscIO/Src/CompressedBlob.cpp
index c0863a82bc..370c8b8ede 100644
--- a/Source/Core/DiscIO/Src/CompressedBlob.cpp
+++ b/Source/Core/DiscIO/Src/CompressedBlob.cpp
@@ -181,7 +181,7 @@ bool CompressFileToBlob(const char* infile, const char* outfile, u32 sub_type,
 	callback("Files opened, ready to compress.", 0, arg);

 

 	fseek(inf, 0, SEEK_END);

-	int insize = ftell(inf);

+	s64 insize = ftell(inf);

 	fseek(inf, 0, SEEK_SET);

 	CompressedBlobHeader header;

 	header.magic_cookie = kBlobCookie;