diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-08-22 14:47:53 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-08-24 21:08:15 +0300 |
| commit | 5e4fcb8a6036746ec1b500297fa55989a80094b4 (patch) | |
| tree | 915d788dcaf3bc39bed6985236fb879c3c93f6cb /src/soundmanager.cpp | |
| parent | 2480ea4cc668ff99007dd6fb8b44911eea5d5287 (diff) | |
| download | manaplus-5e4fcb8a6036746ec1b500297fa55989a80094b4.tar.gz manaplus-5e4fcb8a6036746ec1b500297fa55989a80094b4.tar.bz2 manaplus-5e4fcb8a6036746ec1b500297fa55989a80094b4.tar.xz manaplus-5e4fcb8a6036746ec1b500297fa55989a80094b4.zip | |
final SDL2 compilation fixes.
now it can be compiled, but still not works.
Diffstat (limited to 'src/soundmanager.cpp')
| -rw-r--r-- | src/soundmanager.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp index 72a7d26c2..8575edd2b 100644 --- a/src/soundmanager.cpp +++ b/src/soundmanager.cpp @@ -165,7 +165,6 @@ void SoundManager::init() void SoundManager::info() const { SDL_version compiledVersion; - char driver[40] = "Unknown"; const char *format = "Unknown"; int rate = 0; uint16_t audioFormat = 0; @@ -174,7 +173,12 @@ void SoundManager::info() const MIX_VERSION(&compiledVersion); const SDL_version *const linkedVersion = Mix_Linked_Version(); +#ifdef USE_SDL2 + const char *driver = SDL_GetCurrentAudioDriver(); +#else + char driver[40] = "Unknown"; SDL_AudioDriverName(driver, 40); +#endif Mix_QuerySpec(&rate, &audioFormat, &channels); switch (audioFormat) |