diff options
author | eray orçunus <erayorcunus@gmail.com> | 2020-07-22 13:56:28 +0200 |
---|---|---|
committer | eray orçunus <erayorcunus@gmail.com> | 2020-07-22 17:51:28 +0200 |
commit | 1dc6fbda1fbd9a731eb20b3ef71c3dda989e511e (patch) | |
tree | 5578c27b5739341d34def86586a68f1f1129e1bb /src/audio/oal/stream.cpp | |
parent | README 64-bit preparation (diff) | |
download | re3-1dc6fbda1fbd9a731eb20b3ef71c3dda989e511e.tar re3-1dc6fbda1fbd9a731eb20b3ef71c3dda989e511e.tar.gz re3-1dc6fbda1fbd9a731eb20b3ef71c3dda989e511e.tar.bz2 re3-1dc6fbda1fbd9a731eb20b3ef71c3dda989e511e.tar.lz re3-1dc6fbda1fbd9a731eb20b3ef71c3dda989e511e.tar.xz re3-1dc6fbda1fbd9a731eb20b3ef71c3dda989e511e.tar.zst re3-1dc6fbda1fbd9a731eb20b3ef71c3dda989e511e.zip |
Diffstat (limited to 'src/audio/oal/stream.cpp')
-rw-r--r-- | src/audio/oal/stream.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/audio/oal/stream.cpp b/src/audio/oal/stream.cpp index 34518f54..5639bd12 100644 --- a/src/audio/oal/stream.cpp +++ b/src/audio/oal/stream.cpp @@ -5,7 +5,11 @@ #include "sampman.h" #ifdef _WIN32 + +// TODO: This is due to version difference of 32-bit libmpg123 and 64-bit libmpg123, fix it +#ifndef _WIN64 typedef long ssize_t; +#endif #pragma comment( lib, "libsndfile-1.lib" ) #pragma comment( lib, "libmpg123.lib" ) #else @@ -166,8 +170,11 @@ public: size_t size; int err = mpg123_read(m_pMH, (unsigned char *)buffer, GetBufferSize(), &size); +#if defined(__LP64__) || defined(_WIN64) + assert("We can't handle audio files more then 2 GB yet :shrug:" && (size < UINT32_MAX)); +#endif if (err != MPG123_OK && err != MPG123_DONE) return 0; - return size; + return (uint32)size; } }; |