Replaced "unsigned __int32" by "u32".
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@432 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
36b464cbc8
commit
6e2416b389
|
@ -257,7 +257,7 @@ void GenerateAudioInterrupt()
|
|||
|
||||
// Callback for the disc streaming
|
||||
// WARNING - called from audio thread
|
||||
unsigned __int32 Callback_GetStreaming(short* _pDestBuffer, unsigned __int32 _numSamples)
|
||||
u32 Callback_GetStreaming(short* _pDestBuffer, u32 _numSamples)
|
||||
{
|
||||
if (g_AudioRegister.m_Control.PSTAT && !CCPU::IsStepping())
|
||||
{
|
||||
|
|
|
@ -20,6 +20,8 @@
|
|||
#ifndef _AUDIOINTERFACE_H
|
||||
#define _AUDIOINTERFACE_H
|
||||
|
||||
#include "CommonTypes.h"
|
||||
|
||||
class PointerWrap;
|
||||
|
||||
namespace AudioInterface
|
||||
|
@ -32,7 +34,7 @@ void DoState(PointerWrap &p);
|
|||
void Update();
|
||||
|
||||
// Calls by DSP plugin
|
||||
unsigned __int32 Callback_GetStreaming(short* _pDestBuffer, unsigned __int32 _numSamples);
|
||||
u32 Callback_GetStreaming(short* _pDestBuffer, u32 _numSamples);
|
||||
|
||||
void HWCALL Read32(u32& _uReturnValue, const u32 _iAddress);
|
||||
void HWCALL Write32(const u32 _iValue, const u32 _iAddress);
|
||||
|
@ -44,4 +46,3 @@ u32 GetDSPSampleRate();
|
|||
} // namespace
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@ typedef void (__cdecl* TDVD_SetISOFile) (const char*);
|
|||
typedef BOOL (__cdecl* TDVD_GetISOName) (TCHAR*, int);
|
||||
typedef BOOL (__cdecl* TDVD_ReadToPtr) (LPBYTE, unsigned __int64, unsigned __int64);
|
||||
typedef BOOL (__cdecl* TDVD_IsValid) ();
|
||||
typedef unsigned __int32 (__cdecl* TDVD_Read32) (unsigned __int64);
|
||||
typedef u32 (__cdecl* TDVD_Read32) (unsigned __int64);
|
||||
|
||||
//! Function Pointer
|
||||
TGetDllInfo g_GetDllInfo = NULL;
|
||||
|
@ -155,7 +155,7 @@ bool DVD_IsValid()
|
|||
return (g_DVD_IsValid() == TRUE) ? true : false;
|
||||
}
|
||||
|
||||
unsigned __int32 DVD_Read32(unsigned __int64 _dwOffset)
|
||||
u32 DVD_Read32(unsigned __int64 _dwOffset)
|
||||
{
|
||||
return g_DVD_Read32(_dwOffset);
|
||||
}
|
||||
|
|
|
@ -64,10 +64,10 @@ bool DVD_ReadToPtr(LPBYTE ptr, unsigned __int64 _dwOffset, unsigned __int64 _dwL
|
|||
bool DVD_IsValid();
|
||||
|
||||
//! DVDRead32
|
||||
unsigned __int32 DVD_Read32(unsigned __int64 _dwOffset);
|
||||
u32 DVD_Read32(unsigned __int64 _dwOffset);
|
||||
|
||||
//! SaveLoadState
|
||||
unsigned __int32 SaveLoadState(char *ptr, BOOL save);
|
||||
u32 SaveLoadState(char *ptr, BOOL save);
|
||||
|
||||
} // end of namespace PluginDVD
|
||||
|
||||
|
|
|
@ -49,7 +49,6 @@ typedef unsigned long long u64;
|
|||
typedef char s8;
|
||||
typedef short s16;
|
||||
typedef int s32;
|
||||
#define __int32 int
|
||||
typedef long long s64;
|
||||
#define __int64 long long
|
||||
|
||||
|
|
Loading…
Reference in New Issue