From 03378679c6e7b5833ddca59d9aacc22a22f7654c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 25 Oct 2017 23:54:03 +0300 Subject: Add sdlmusichelper with some SDL/SDL2 functions. --- src/utils/sdl2musichelper.cpp | 53 +++++++++++++++++++++++++++++++++++++++++++ src/utils/sdl2musichelper.h | 44 +++++++++++++++++++++++++++++++++++ src/utils/sdlmusichelper.cpp | 43 +++++++++++++++++++++++++++++++++++ src/utils/sdlmusichelper.h | 48 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 188 insertions(+) create mode 100644 src/utils/sdl2musichelper.cpp create mode 100644 src/utils/sdl2musichelper.h create mode 100644 src/utils/sdlmusichelper.cpp create mode 100644 src/utils/sdlmusichelper.h (limited to 'src/utils') diff --git a/src/utils/sdl2musichelper.cpp b/src/utils/sdl2musichelper.cpp new file mode 100644 index 000000000..300f79991 --- /dev/null +++ b/src/utils/sdl2musichelper.cpp @@ -0,0 +1,53 @@ +/* + * The ManaPlus Client + * Copyright (C) 2013-2017 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifdef USE_SDL2 + +#include "utils/sdl2musichelper.h" + +#include "debug.h" + +int SDL::MixOpenAudio(const int frequency, + const uint16_t format, + const int nchannels, + const int chunksize) +{ +#if SDL_MIXER_VERSION_ATLEAST(2, 0, 2) + return Mix_OpenAudioDevice(frequency, + format, + nchannels, + chunksize, + nullptr, + SDL_AUDIO_ALLOW_FREQUENCY_CHANGE | SDL_AUDIO_ALLOW_CHANNELS_CHANGE); +#else // SDL_MIXER_VERSION_ATLEAST(2, 0, 2) + + return Mix_OpenAudio(frequency, + format, + nchannels, + chunksize); +#endif // SDL_MIXER_VERSION_ATLEAST(2, 0, 2) +} + +Mix_Music *SDL::LoadMUSOgg_RW(SDL_RWops *const rw) +{ + return Mix_LoadMUSType_RW(rw, MUS_OGG, 1); +} + +#endif // USE_SDL2 diff --git a/src/utils/sdl2musichelper.h b/src/utils/sdl2musichelper.h new file mode 100644 index 000000000..6c9207563 --- /dev/null +++ b/src/utils/sdl2musichelper.h @@ -0,0 +1,44 @@ +/* + * The ManaPlus Client + * Copyright (C) 2013-2017 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef UTILS_SDL2MUSICHELPER_H +#define UTILS_SDL2MUSICHELPER_H + +#ifdef USE_SDL2 + +#include "localconsts.h" + +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") +#include +PRAGMA48(GCC diagnostic pop) + +namespace SDL +{ + int MixOpenAudio(const int frequency, + const uint16_t format, + const int nchannels, + const int chunksize); + + Mix_Music *LoadMUSOgg_RW(SDL_RWops *const rw); +} // namespace SDL + +#endif // USE_SDL2 +#endif // UTILS_SDL2MUSICHELPER_H diff --git a/src/utils/sdlmusichelper.cpp b/src/utils/sdlmusichelper.cpp new file mode 100644 index 000000000..2987f9533 --- /dev/null +++ b/src/utils/sdlmusichelper.cpp @@ -0,0 +1,43 @@ +/* + * The ManaPlus Client + * Copyright (C) 2013-2017 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef USE_SDL2 + +#include "utils/sdlmusichelper.h" + +#include "debug.h" + +int SDL::MixOpenAudio(const int frequency, + const uint16_t format, + const int nchannels, + const int chunksize) +{ + return Mix_OpenAudio(frequency, + format, + nchannels, + chunksize); +} + +Mix_Music *SDL::LoadMUSOgg_RW(SDL_RWops *const rw) +{ + return Mix_LoadMUS_RW(rw); +} + +#endif // USE_SDL2 diff --git a/src/utils/sdlmusichelper.h b/src/utils/sdlmusichelper.h new file mode 100644 index 000000000..b07aa9a10 --- /dev/null +++ b/src/utils/sdlmusichelper.h @@ -0,0 +1,48 @@ +/* + * The ManaPlus Client + * Copyright (C) 2013-2017 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef UTILS_SDLMUSICHELPER_H +#define UTILS_SDLMUSICHELPER_H + +#ifdef USE_SDL2 +#include "utils/sdl2musichelper.h" +UTILS_SDL2MUSICHELPER_H + +#else + +#include "localconsts.h" + +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") +#include +PRAGMA48(GCC diagnostic pop) + +namespace SDL +{ + int MixOpenAudio(const int frequency, + const uint16_t format, + const int nchannels, + const int chunksize); + + Mix_Music *LoadMUSOgg_RW(SDL_RWops *const rw); +} // namespace SDL + +#endif // USE_SDL2 +#endif // UTILS_SDLMUSICHELPER_H -- cgit v1.2.3-60-g2f50