The-Homebrew-Cloud/re3-wiiu
2
0
Fork 0
mirror of https://gitlab.com/GaryOderNichts/re3-wiiu.git synced 2024-12-23 00:01:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge fixes

Browse Source
This commit is contained in:
GaryOderNichts 2021-01-25 08:39:06 +01:00
parent 155f057edf
commit 55351cbe35
5 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/audio/oal/stream.cpp
View File

@ -641,7 +641,11 @@ public:
}
};
#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)
{
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);
}
#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
{

1
src/audio/sampman_oal.cpp
View File

@ -2026,7 +2026,6 @@ cSampleManager::InitialiseSampleBanks(void)
m_aSamples[i].nLoopEnd = BSWAP32(m_aSamples[i].nLoopEnd);
}
#endif
#ifdef AUDIO_OPUS
#ifdef OPUS_SFX
int32 _nSampleDataEndOffset = m_aSamples[TOTAL_AUDIO_SAMPLES - 1].nOffset + m_aSamples[TOTAL_AUDIO_SAMPLES - 1].nSize;
#endif

9
src/core/common.h
View File

@ -102,6 +102,10 @@ typedef int64_t int64;
// hardcode ucs-2
typedef uint16_t wchar;
typedef uint8 bool8;
typedef uint16 bool16;
typedef uint32 bool32;
#ifdef BIGENDIAN
inline float _floatswap32(float f)
{
@ -135,11 +139,6 @@ inline float _floatswap32(float f)
#define FLOATSWAP32(x) (x)
#endif
#if defined(_MSC_VER)
typedef uint8 bool8;
typedef uint16 bool16;
typedef uint32 bool32;
#if defined(_MSC_VER) || defined (__MWERKS__)
typedef ptrdiff_t ssize_t;
#endif

4
src/core/config.h
View File

@ -158,7 +158,7 @@ enum Config {
// This is enabled for all released games except mobile
// any debug stuff that is only left in mobile, is not in MASTER
#define MASTER
//#define MASTER
// once and for all:
// pc: FINAL & MASTER
@ -384,7 +384,7 @@ enum Config {
#define RADIO_SCROLL_TO_PREV_STATION
#define AUDIO_CACHE
//#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
#ifdef AUDIO_OPUS

2
src/core/re3.cpp
View File

@ -34,7 +34,7 @@
#include "MBlur.h"
#include "ControllerConfig.h"
#ifdef DONT_TRUST_RECOGNIZED_JOYSTICKS
#if 1
#include "crossplatform.h"
#endif