diff --git a/out/bins/ext_booter.bin b/out/bins/ext_booter.bin index 11f2b717..6b082c2d 100644 Binary files a/out/bins/ext_booter.bin and b/out/bins/ext_booter.bin differ diff --git a/out/boot.dol b/out/boot.dol index 7ad3ffd3..9570709f 100644 Binary files a/out/boot.dol and b/out/boot.dol differ diff --git a/source/defines.h b/source/defines.h index ec931b9b..80efd89a 100644 --- a/source/defines.h +++ b/source/defines.h @@ -1,6 +1,6 @@ #define APP_NAME "WiiFlow WFL" -#define APP_VERSION "5.4.8" +#define APP_VERSION "5.4.9 beta 1" #define APP_DATA_DIR "wiiflow" #define APPS_DIR "apps/wiiflow" diff --git a/source/music/SoundDecoder.cpp b/source/music/SoundDecoder.cpp index 526e6b04..b235d30b 100644 --- a/source/music/SoundDecoder.cpp +++ b/source/music/SoundDecoder.cpp @@ -108,7 +108,7 @@ void SoundDecoder::EnableUpsample(void) if( (ResampleBuffer == NULL) && IsStereo() && Is16Bit() && SampleRate != 32000 - && SampleRate != 48000) + && SampleRate < 48000) { ResampleBuffer = (u8*)memalign(32, SoundBlockSize); ResampleRatio = ( FixedPointScale * SampleRate ) / 48000; diff --git a/source/music/SoundDecoder.hpp b/source/music/SoundDecoder.hpp index a4c9fc23..2790a4ef 100644 --- a/source/music/SoundDecoder.hpp +++ b/source/music/SoundDecoder.hpp @@ -56,7 +56,7 @@ public: virtual int Seek(int pos) { CurPos = pos; return file_fd->seek(CurPos, SEEK_SET); }; virtual int Rewind(); virtual u8 GetFormat() { return Format; } - virtual u16 GetSampleRate() { return SampleRate; } + virtual u32 GetSampleRate() { return SampleRate; } virtual void Decode(); virtual u32 GetBufferSize() { return SoundBuffer.GetBufferSize(); }; virtual u8 * GetBuffer() { return SoundBuffer.GetBuffer(); }; @@ -94,7 +94,7 @@ protected: bool Decoding; bool ExitRequested; u8 Format; - u16 SampleRate; + u32 SampleRate; u8 *ResampleBuffer; u32 ResampleRatio; };