diff options
| author | James Cowgill <jcowgill@debian.org> | 2018-09-24 09:16:30 +0100 |
|---|---|---|
| committer | James Cowgill <jcowgill@debian.org> | 2018-09-24 09:16:30 +0100 |
| commit | 40a44b2820c7a9e974459e11092f2ff2d351743d (patch) | |
| tree | ccac9cc137b7fb5328b481f1f358e63165c6fef3 /openmpt123 | |
| parent | b307520e10780536a1d4be5b81fc67d99b6815cd (diff) | |
New upstream version 0.3.12
Diffstat (limited to 'openmpt123')
| -rw-r--r-- | openmpt123/openmpt123.hpp | 2 | ||||
| -rw-r--r-- | openmpt123/openmpt123_config.hpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/openmpt123/openmpt123.hpp b/openmpt123/openmpt123.hpp index 8606398..4665685 100644 --- a/openmpt123/openmpt123.hpp +++ b/openmpt123/openmpt123.hpp @@ -565,7 +565,7 @@ protected: sampleQueueMaxFrames = frames; } template < typename Tsample > - float pop_queue() { + Tsample pop_queue() { float val = 0.0f; if ( !sampleQueue.empty() ) { val = sampleQueue.front(); diff --git a/openmpt123/openmpt123_config.hpp b/openmpt123/openmpt123_config.hpp index fc76f0f..9558215 100644 --- a/openmpt123/openmpt123_config.hpp +++ b/openmpt123/openmpt123_config.hpp @@ -57,6 +57,10 @@ #endif // MPT_BUILD_MSVC +#if defined(MPT_WITH_SDL) && defined(MPT_WITH_SDL2) +#error "MPT_WITH_SDL2 and MPT_WITH_SDL are mutually exclusive." +#endif + #if defined(MPT_WITH_SDL) #ifndef MPT_NEEDS_THREADS #define MPT_NEEDS_THREADS |