Macintosh-Tools
/
Pomme
mirror of https://github.com/jorio/Pomme.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix MP3 support for older compilers

This commit is contained in:
Iliyas Jorio 2022-08-03 00:09:07 +02:00
parent 5d3fcb6ec6
commit 3fdd6f80f8
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/SoundFormats/SoundFormats.cpp
View File

@ -3,6 +3,7 @@
#include "PommeSound.h"
#include "Utilities/memstream.h"
#include "Utilities/bigendianstreams.h"
#include <Utilities/StringUtils.h>
#include <cstring>
using namespace Pomme::Sound;
@ -267,17 +268,17 @@ SndListHandle Pomme_SndLoadFileAsResource(short fRefNum)
auto& spec = Pomme::Files::GetSpec(fRefNum);
auto& stream = Pomme::Files::GetStream(fRefNum);
std::string fileName(spec.cName);
std::transform(fileName.begin(), fileName.end(), fileName.begin(), tolower);
std::string fileName = UppercaseCopy(spec.cName);
fs::path extension = fs::path(AsU8(fileName)).extension();
// Guess media container from extension
if (fileName.ends_with(".aiff")
|| fileName.ends_with(".aifc")
|| fileName.ends_with(".aif"))
if (extension == ".AIFF"
|| extension == ".AIFC"
|| extension == ".AIF")
{
return LoadAIFFAsResource(stream);
}
else if (fileName.ends_with(".mp3"))
else if (extension == ".MP3")
{
#ifndef POMME_NO_MP3
return LoadMP3AsResource(stream);

2
src/SoundFormats/mp3.cpp
View File

@ -16,7 +16,7 @@ SndListHandle Pomme::Sound::LoadMP3AsResource(std::istream& stream)
mp3dec_t context = {};
mp3dec_init(&context);
mp3dec_frame_info_t frameInfo;
mp3dec_frame_info_t frameInfo = {};
std::vector<uint8_t> fileBuf;
std::vector<mp3d_sample_t> songPCM;