LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 00:02:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '12.0' into GraphicsBuffer

Browse Source
This commit is contained in:
Alex Szpakowski
2020-02-01 17:34:32 -04:00
parent c9809d8d82 7684920f19
commit 7a997fb21f
30 changed files with 4400 additions and 2208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/sound/lullaby/FLACDecoder.cpp
+2 -3
View File
@@ -34,7 +34,7 @@ namespace lullaby
FLACDecoder::FLACDecoder(Data *data, int nbufferSize)
: Decoder(data, nbufferSize)
{
flac = drflac_open_memory(data->getData(), data->getSize());
flac = drflac_open_memory(data->getData(), data->getSize(), nullptr);
if (flac == nullptr)
throw love::Exception("Could not load FLAC file");
}
@@ -52,7 +52,7 @@ bool FLACDecoder::accepts(const std::string &ext)
// Please remove once it's no longer the case.
static const std::string supported[] =
{
"flac", "ogg"
"flac", "ogg", ""
};
for (int i = 0; !(supported[i].empty()); i++)
@@ -125,4 +125,3 @@ double FLACDecoder::getDuration()
} // lullaby
} // sound
} // love