TheCloud/libSDL2pp
1
0
Fork 0
mirror of https://github.com/libSDL2pp/libSDL2pp.git synced 2025-09-08 06:48:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Split AudioSpec into separate header

Browse Source
This commit is contained in:
Dmitry Marakasov 2014-12-18 18:26:11 +03:00
parent c14ec31ed8
commit a6ef469487
10 changed files with 67 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -70,7 +70,8 @@ SET(LIBRARY_SOURCES
) )
SET(LIBRARY_HEADERS SET(LIBRARY_HEADERS
SDL2pp/Audio.hh SDL2pp/AudioDevice.hh
SDL2pp/AudioSpec.hh
SDL2pp/ContainerRWops.hh SDL2pp/ContainerRWops.hh
SDL2pp/Exception.hh SDL2pp/Exception.hh
SDL2pp/Point.hh SDL2pp/Point.hh

3
SDL2pp/AudioDevice.cc
View File

@ -20,8 +20,9 @@
*/ */
#include <SDL2pp/Exception.hh> #include <SDL2pp/Exception.hh>
#include <SDL2pp/AudioSpec.hh>
#include <SDL2pp/Audio.hh> #include <SDL2pp/AudioDevice.hh>
namespace SDL2pp { namespace SDL2pp {

22
SDL2pp/Audio.hh → SDL2pp/AudioDevice.hh
View File

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef SDL2PP_AUDIO_HH #ifndef SDL2PP_AUDIODEVICE_HH
#define SDL2PP_AUDIO_HH #define SDL2PP_AUDIODEVICE_HH
#include <functional> #include <functional>
#include <string> #include <string>
@ -31,23 +31,7 @@
namespace SDL2pp { namespace SDL2pp {
class AudioSpec : public SDL_AudioSpec { class AudioSpec;
public:
AudioSpec();
AudioSpec(int freq, SDL_AudioFormat format, Uint8 channels, Uint16 samples);
~AudioSpec();
AudioSpec(AudioSpec&& other);
AudioSpec& operator=(AudioSpec&& other);
AudioSpec(const AudioSpec& other) = delete;
AudioSpec& operator=(const AudioSpec& other) = delete;
void MergeChanges(const SDL_AudioSpec& obtained);
const SDL_AudioSpec* Get() const;
bool IsSameFormat(const AudioSpec& other) const;
};
class AudioDevice { class AudioDevice {
public: public:

2
SDL2pp/AudioLock.cc
View File

@ -19,7 +19,7 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#include <SDL2pp/Audio.hh> #include <SDL2pp/AudioDevice.hh>
namespace SDL2pp { namespace SDL2pp {

2
SDL2pp/AudioSpec.cc
View File

@ -21,7 +21,7 @@
#include <algorithm> #include <algorithm>
#include <SDL2pp/Audio.hh> #include <SDL2pp/AudioSpec.hh>
namespace SDL2pp { namespace SDL2pp {

49
SDL2pp/AudioSpec.hh Normal file
View File

@ -0,0 +1,49 @@
/*
libSDL2pp - C++11 bindings/wrapper for SDL2
Copyright (C) 2014 Dmitry Marakasov <amdmi3@amdmi3.ru>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
*/
#ifndef SDL2PP_AUDIOSPEC_HH
#define SDL2PP_AUDIOSPEC_HH
#include <SDL2/SDL_audio.h>
namespace SDL2pp {
class AudioSpec : public SDL_AudioSpec {
public:
AudioSpec();
AudioSpec(int freq, SDL_AudioFormat format, Uint8 channels, Uint16 samples);
~AudioSpec();
AudioSpec(AudioSpec&& other);
AudioSpec& operator=(AudioSpec&& other);
AudioSpec(const AudioSpec& other) = delete;
AudioSpec& operator=(const AudioSpec& other) = delete;
void MergeChanges(const SDL_AudioSpec& obtained);
const SDL_AudioSpec* Get() const;
bool IsSameFormat(const AudioSpec& other) const;
};
}
#endif

3
SDL2pp/SDL2pp.hh
View File

@ -26,7 +26,8 @@
#include <SDL2pp/Config.hh> #include <SDL2pp/Config.hh>
#include <SDL2pp/SDL.hh> #include <SDL2pp/SDL.hh>
#include <SDL2pp/Audio.hh> #include <SDL2pp/AudioDevice.hh>
#include <SDL2pp/AudioSpec.hh>
#include <SDL2pp/Window.hh> #include <SDL2pp/Window.hh>
#include <SDL2pp/Renderer.hh> #include <SDL2pp/Renderer.hh>
#include <SDL2pp/Texture.hh> #include <SDL2pp/Texture.hh>

4
SDL2pp/Wav.hh
View File

@ -22,7 +22,9 @@
#ifndef SDL2PP_WAV_HH #ifndef SDL2PP_WAV_HH
#define SDL2PP_WAV_HH #define SDL2PP_WAV_HH
#include <SDL2pp/Audio.hh> #include <string>
#include <SDL2pp/AudioSpec.hh>
namespace SDL2pp { namespace SDL2pp {

3
demos/audio_sine.cc
View File

@ -24,7 +24,8 @@
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
#include <SDL2pp/SDL.hh> #include <SDL2pp/SDL.hh>
#include <SDL2pp/Audio.hh> #include <SDL2pp/AudioDevice.hh>
#include <SDL2pp/AudioSpec.hh>
#include <SDL2pp/Exception.hh> #include <SDL2pp/Exception.hh>
using namespace SDL2pp; using namespace SDL2pp;

3
demos/audio_wav.cc
View File

@ -25,7 +25,8 @@
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
#include <SDL2pp/SDL.hh> #include <SDL2pp/SDL.hh>
#include <SDL2pp/Audio.hh> #include <SDL2pp/AudioDevice.hh>
#include <SDL2pp/AudioSpec.hh>
#include <SDL2pp/Wav.hh> #include <SDL2pp/Wav.hh>
#include <SDL2pp/Exception.hh> #include <SDL2pp/Exception.hh>