mirror of
https://gitlab.com/GaryOderNichts/re3-wiiu.git
synced 2024-12-23 08:11:49 +01:00
merge fixes
This commit is contained in:
parent
155f057edf
commit
55351cbe35
@ -641,7 +641,11 @@ public:
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef AUDIO_OAL_USE_MPG123
|
||||||
|
// fuzzy seek eliminates stutter when playing ADF but spams errors a lot (nothing breaks though)
|
||||||
|
#define MP3_USE_FUZZY_SEEK
|
||||||
static ssize_t mpg123_read_replacement(void* handle, void* data, size_t size)
|
static ssize_t mpg123_read_replacement(void* handle, void* data, size_t size)
|
||||||
{
|
{
|
||||||
return fread(data, 1, size, (FILE*)handle);
|
return fread(data, 1, size, (FILE*)handle);
|
||||||
@ -651,11 +655,6 @@ static off_t mpg123_seek_replacement(void* handle, off_t offset, int whence)
|
|||||||
{
|
{
|
||||||
return fseek((FILE*)handle, offset, whence);
|
return fseek((FILE*)handle, offset, whence);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef AUDIO_OAL_USE_MPG123
|
|
||||||
// fuzzy seek eliminates stutter when playing ADF but spams errors a lot (nothing breaks though)
|
|
||||||
#define MP3_USE_FUZZY_SEEK
|
|
||||||
|
|
||||||
class CMP3File : public IDecoder
|
class CMP3File : public IDecoder
|
||||||
{
|
{
|
||||||
|
@ -2026,7 +2026,6 @@ cSampleManager::InitialiseSampleBanks(void)
|
|||||||
m_aSamples[i].nLoopEnd = BSWAP32(m_aSamples[i].nLoopEnd);
|
m_aSamples[i].nLoopEnd = BSWAP32(m_aSamples[i].nLoopEnd);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#ifdef AUDIO_OPUS
|
|
||||||
#ifdef OPUS_SFX
|
#ifdef OPUS_SFX
|
||||||
int32 _nSampleDataEndOffset = m_aSamples[TOTAL_AUDIO_SAMPLES - 1].nOffset + m_aSamples[TOTAL_AUDIO_SAMPLES - 1].nSize;
|
int32 _nSampleDataEndOffset = m_aSamples[TOTAL_AUDIO_SAMPLES - 1].nOffset + m_aSamples[TOTAL_AUDIO_SAMPLES - 1].nSize;
|
||||||
#endif
|
#endif
|
||||||
|
@ -102,6 +102,10 @@ typedef int64_t int64;
|
|||||||
// hardcode ucs-2
|
// hardcode ucs-2
|
||||||
typedef uint16_t wchar;
|
typedef uint16_t wchar;
|
||||||
|
|
||||||
|
typedef uint8 bool8;
|
||||||
|
typedef uint16 bool16;
|
||||||
|
typedef uint32 bool32;
|
||||||
|
|
||||||
#ifdef BIGENDIAN
|
#ifdef BIGENDIAN
|
||||||
inline float _floatswap32(float f)
|
inline float _floatswap32(float f)
|
||||||
{
|
{
|
||||||
@ -135,11 +139,6 @@ inline float _floatswap32(float f)
|
|||||||
#define FLOATSWAP32(x) (x)
|
#define FLOATSWAP32(x) (x)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(_MSC_VER)
|
|
||||||
typedef uint8 bool8;
|
|
||||||
typedef uint16 bool16;
|
|
||||||
typedef uint32 bool32;
|
|
||||||
|
|
||||||
#if defined(_MSC_VER) || defined (__MWERKS__)
|
#if defined(_MSC_VER) || defined (__MWERKS__)
|
||||||
typedef ptrdiff_t ssize_t;
|
typedef ptrdiff_t ssize_t;
|
||||||
#endif
|
#endif
|
||||||
|
@ -158,7 +158,7 @@ enum Config {
|
|||||||
|
|
||||||
// This is enabled for all released games except mobile
|
// This is enabled for all released games except mobile
|
||||||
// any debug stuff that is only left in mobile, is not in MASTER
|
// any debug stuff that is only left in mobile, is not in MASTER
|
||||||
#define MASTER
|
//#define MASTER
|
||||||
|
|
||||||
// once and for all:
|
// once and for all:
|
||||||
// pc: FINAL & MASTER
|
// pc: FINAL & MASTER
|
||||||
@ -384,7 +384,7 @@ enum Config {
|
|||||||
#define RADIO_SCROLL_TO_PREV_STATION
|
#define RADIO_SCROLL_TO_PREV_STATION
|
||||||
#define AUDIO_CACHE
|
#define AUDIO_CACHE
|
||||||
//#define PS2_AUDIO_PATHS // changes audio paths for cutscenes and radio to PS2 paths (needs vbdec on MSS builds)
|
//#define PS2_AUDIO_PATHS // changes audio paths for cutscenes and radio to PS2 paths (needs vbdec on MSS builds)
|
||||||
//#define AUDIO_OAL_USE_SNDFILE // use libsndfile to decode WAVs instead of our internal decoder
|
#define AUDIO_OAL_USE_SNDFILE // use libsndfile to decode WAVs instead of our internal decoder
|
||||||
#define AUDIO_OAL_USE_MPG123 // use mpg123 to support mp3 files
|
#define AUDIO_OAL_USE_MPG123 // use mpg123 to support mp3 files
|
||||||
|
|
||||||
#ifdef AUDIO_OPUS
|
#ifdef AUDIO_OPUS
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
#include "MBlur.h"
|
#include "MBlur.h"
|
||||||
#include "ControllerConfig.h"
|
#include "ControllerConfig.h"
|
||||||
|
|
||||||
#ifdef DONT_TRUST_RECOGNIZED_JOYSTICKS
|
#if 1
|
||||||
#include "crossplatform.h"
|
#include "crossplatform.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user