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

Fix compile error.

Browse Source
This commit is contained in:
Miku AuahDark
2022-05-02 09:43:08 +08:00
parent c9ab08a2d3
commit 5c3f8a8950
2 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/sound/lullaby/MP3Decoder.cpp
+31 -31
View File
@@ -30,37 +30,6 @@ namespace sound
namespace lullaby
{
static size_t onRead(void *pUserData, void *pBufferOut, size_t bytesToRead)
{
auto decoder = (MP3Decoder *) pUserData;
int64 read = decoder->stream->read(pBufferOut, bytesToRead);
return std::max<int64>(0, read);
}
static drmp3_bool32 onSeek(void *pUserData, int offset, drmp3_seek_origin origin)
{
auto decoder = (MP3Decoder *) pUserData;
int64 pos = decoder->offset;
// Due to possible offsets, we have to calculate the position ourself.
switch (origin)
{
case drmp3_seek_origin_start:
pos += offset;
break;
case drmp3_seek_origin_current:
pos = decoder->stream->tell() + offset;
break;
default:
return false;
}
if (pos < decoder->offset)
return false;
return decoder->stream->seek(pos, Stream::SEEKORIGIN_BEGIN) ? DRMP3_TRUE : DRMP3_FALSE;
}
// Copied from dr_mp3 function drmp3_hdr_valid()
static bool isMP3HeaderValid(const uint8 *h)
{
@@ -135,6 +104,37 @@ static int64 findFirstValidHeader(Stream* stream)
return -1;
}
size_t MP3Decoder::onRead(void *pUserData, void *pBufferOut, size_t bytesToRead)
{
auto decoder = (MP3Decoder *) pUserData;
int64 read = decoder->stream->read(pBufferOut, bytesToRead);
return std::max<int64>(0, read);
}
drmp3_bool32 MP3Decoder::onSeek(void *pUserData, int offset, drmp3_seek_origin origin)
{
auto decoder = (MP3Decoder *) pUserData;
int64 pos = decoder->offset;
// Due to possible offsets, we have to calculate the position ourself.
switch (origin)
{
case drmp3_seek_origin_start:
pos += offset;
break;
case drmp3_seek_origin_current:
pos = decoder->stream->tell() + offset;
break;
default:
return false;
}
if (pos < decoder->offset)
return false;
return decoder->stream->seek(pos, Stream::SEEKORIGIN_BEGIN) ? DRMP3_TRUE : DRMP3_FALSE;
}
MP3Decoder::MP3Decoder(Stream *stream, int bufferSize)
: Decoder(stream, bufferSize)
{
src/modules/sound/lullaby/MP3Decoder.h
+2 -2
View File
@@ -54,8 +54,8 @@ public:
double getDuration() override;
private:
friend size_t onRead(void *pUserData, void *pBufferOut, size_t bytesToRead);
friend drmp3_bool32 onSeek(void *pUserData, int offset, drmp3_seek_origin origin);
static size_t onRead(void *pUserData, void *pBufferOut, size_t bytesToRead);
static drmp3_bool32 onSeek(void *pUserData, int offset, drmp3_seek_origin origin);
// MP3 handle
drmp3 mp3;