diff options
Diffstat (limited to 'src/libjin/Audio')
| -rw-r--r-- | src/libjin/Audio/Audio.cpp | 2 | ||||
| -rw-r--r-- | src/libjin/Audio/Audio.h | 4 | ||||
| -rw-r--r-- | src/libjin/Audio/SDL/SDLAudio.cpp | 2 | ||||
| -rw-r--r-- | src/libjin/Audio/SDL/SDLAudio.h | 4 | ||||
| -rw-r--r-- | src/libjin/Audio/SDL/SDLSource.cpp | 2 | ||||
| -rw-r--r-- | src/libjin/Audio/SDL/SDLSource.h | 2 | ||||
| -rw-r--r-- | src/libjin/Audio/Source.cpp | 2 | ||||
| -rw-r--r-- | src/libjin/Audio/Source.h | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/src/libjin/Audio/Audio.cpp b/src/libjin/Audio/Audio.cpp index 6c68b35..928f01a 100644 --- a/src/libjin/Audio/Audio.cpp +++ b/src/libjin/Audio/Audio.cpp @@ -1,4 +1,4 @@ -#include "../jin_configuration.h" +#include "../configuration.h" #if LIBJIN_MODULES_AUDIO #include "SDL2/SDL.h" diff --git a/src/libjin/Audio/Audio.h b/src/libjin/Audio/Audio.h index 5ba0844..fd391aa 100644 --- a/src/libjin/Audio/Audio.h +++ b/src/libjin/Audio/Audio.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_AUDIO_H #define __LIBJIN_AUDIO_H -#include "../jin_configuration.h" +#include "../configuration.h" #if LIBJIN_MODULES_AUDIO #include "SDL2/SDL.h" @@ -38,7 +38,7 @@ namespace jin , state(State::PLAY) {}; virtual ~Audio() {}; - SINGLETON(Audio); + singleton(Audio); float volume; State state; diff --git a/src/libjin/Audio/SDL/SDLAudio.cpp b/src/libjin/Audio/SDL/SDLAudio.cpp index 6c341c0..96bb304 100644 --- a/src/libjin/Audio/SDL/SDLAudio.cpp +++ b/src/libjin/Audio/SDL/SDLAudio.cpp @@ -1,4 +1,4 @@ -#include "../../jin_configuration.h" +#include "../../configuration.h" #if LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO #include <iostream> diff --git a/src/libjin/Audio/SDL/SDLAudio.h b/src/libjin/Audio/SDL/SDLAudio.h index 31022c6..1a29595 100644 --- a/src/libjin/Audio/SDL/SDLAudio.h +++ b/src/libjin/Audio/SDL/SDLAudio.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_AUDIO_SDL_H #define __LIBJIN_AUDIO_SDL_H -#include "../../jin_configuration.h" +#include "../../configuration.h" #if LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO #include "SDLSource.h" @@ -42,7 +42,7 @@ namespace jin void unlock(); private: - SINGLETON(SDLAudio); + singleton(SDLAudio); SDLAudio() {}; ~SDLAudio() {}; /* subsystem interface */ diff --git a/src/libjin/Audio/SDL/SDLSource.cpp b/src/libjin/Audio/SDL/SDLSource.cpp index fc22bbf..34fc0f5 100644 --- a/src/libjin/Audio/SDL/SDLSource.cpp +++ b/src/libjin/Audio/SDL/SDLSource.cpp @@ -1,4 +1,4 @@ -#include "../../jin_configuration.h" +#include "../../configuration.h" #if LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO #include <exception> diff --git a/src/libjin/Audio/SDL/SDLSource.h b/src/libjin/Audio/SDL/SDLSource.h index df005a0..4977ec8 100644 --- a/src/libjin/Audio/SDL/SDLSource.h +++ b/src/libjin/Audio/SDL/SDLSource.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_SOURCE_SDL_H #define __LIBJIN_SOURCE_SDL_H -#include "../../jin_configuration.h" +#include "../../configuration.h" #if LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO #include <vector> diff --git a/src/libjin/Audio/Source.cpp b/src/libjin/Audio/Source.cpp index 8da4cde..646e5ef 100644 --- a/src/libjin/Audio/Source.cpp +++ b/src/libjin/Audio/Source.cpp @@ -1,4 +1,4 @@ -#include "../jin_configuration.h" +#include "../configuration.h" #if LIBJIN_MODULES_AUDIO #include <cstring> diff --git a/src/libjin/Audio/Source.h b/src/libjin/Audio/Source.h index 07a9a4e..6dfc86c 100644 --- a/src/libjin/Audio/Source.h +++ b/src/libjin/Audio/Source.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_AUDIO_SOURCE_H #define __LIBJIN_AUDIO_SOURCE_H -#include "../jin_configuration.h" +#include "../configuration.h" #if LIBJIN_MODULES_AUDIO #include "SDL2/SDL.h" |