diff options
Diffstat (limited to 'src/libjin/audio')
| -rw-r--r-- | src/libjin/audio/SDL/je_sdl_audio.cpp | 6 | ||||
| -rw-r--r-- | src/libjin/audio/SDL/je_sdl_audio.h | 6 | ||||
| -rw-r--r-- | src/libjin/audio/SDL/je_sdl_source.cpp | 32 | ||||
| -rw-r--r-- | src/libjin/audio/SDL/je_sdl_source.h | 6 | ||||
| -rw-r--r-- | src/libjin/audio/je_audio_manager.cpp | 6 | ||||
| -rw-r--r-- | src/libjin/audio/je_audio_manager.h | 46 | ||||
| -rw-r--r-- | src/libjin/audio/je_source.cpp | 30 | ||||
| -rw-r--r-- | src/libjin/audio/je_source.h | 54 |
8 files changed, 93 insertions, 93 deletions
diff --git a/src/libjin/audio/SDL/je_sdl_audio.cpp b/src/libjin/audio/SDL/je_sdl_audio.cpp index b89e8d3..f401502 100644 --- a/src/libjin/audio/SDL/je_sdl_audio.cpp +++ b/src/libjin/audio/SDL/je_sdl_audio.cpp @@ -13,8 +13,8 @@ using namespace JinEngine::Math; namespace JinEngine { - namespace Audio - { + namespace Audio + { namespace SDL { @@ -140,7 +140,7 @@ namespace JinEngine } } // namespace SDL - } // namespace Audio + } // namespace Audio } // namespace JinEngine #endif // (jin_audio) && (jin_audio == jin_audio_sdl)
\ No newline at end of file diff --git a/src/libjin/audio/SDL/je_sdl_audio.h b/src/libjin/audio/SDL/je_sdl_audio.h index 4263767..5db1698 100644 --- a/src/libjin/audio/SDL/je_sdl_audio.h +++ b/src/libjin/audio/SDL/je_sdl_audio.h @@ -11,8 +11,8 @@ namespace JinEngine { - namespace Audio - { + namespace Audio + { namespace SDL { @@ -128,7 +128,7 @@ namespace JinEngine }; } // namespace SDL - } // namespace Audio + } // namespace Audio } // namespace JinEngine #endif // (jin_audio) && (jin_audio == jin_audio_sdl) diff --git a/src/libjin/audio/SDL/je_sdl_source.cpp b/src/libjin/audio/SDL/je_sdl_source.cpp index 90f8daa..39472fd 100644 --- a/src/libjin/audio/SDL/je_sdl_source.cpp +++ b/src/libjin/audio/SDL/je_sdl_source.cpp @@ -19,8 +19,8 @@ using namespace JinEngine::Math; namespace JinEngine { - namespace Audio - { + namespace Audio + { namespace SDL { @@ -162,21 +162,21 @@ namespace JinEngine } #define ActionNone(T)\ - do{\ - Command* cmd = Manager::get()->getCommand();\ - cmd->action = Action::T; \ - cmd->source = this; \ - Manager::get()->pushCommand(cmd); \ - } while (0) + do{\ + Command* cmd = Manager::get()->getCommand();\ + cmd->action = Action::T; \ + cmd->source = this; \ + Manager::get()->pushCommand(cmd); \ + } while (0) #define ActionArg(T, ARGT, ARG)\ - do{\ - Command* cmd = Manager::get()->getCommand();\ - cmd->action = Action::T; \ - cmd->parameter.ARGT = ARG; \ - cmd->source = this; \ - Manager::get()->pushCommand(cmd); \ - }while(0) + do{\ + Command* cmd = Manager::get()->getCommand();\ + cmd->action = Action::T; \ + cmd->parameter.ARGT = ARG; \ + cmd->source = this; \ + Manager::get()->pushCommand(cmd); \ + }while(0) #define ActionInt(T, INT) ActionArg(T, _integer, INT) #define ActionFloat(T, FLT) ActionArg(T, _float, FLT) @@ -388,7 +388,7 @@ namespace JinEngine } } // namespace SDL - } // namespace Audio + } // namespace Audio } // namespace JinEngine #endif // (jin_audio) && (jin_audio == jin_audio_sdl)
\ No newline at end of file diff --git a/src/libjin/audio/SDL/je_sdl_source.h b/src/libjin/audio/SDL/je_sdl_source.h index 8a3309e..3f1c10f 100644 --- a/src/libjin/audio/SDL/je_sdl_source.h +++ b/src/libjin/audio/SDL/je_sdl_source.h @@ -12,8 +12,8 @@ namespace JinEngine { - namespace Audio - { + namespace Audio + { namespace SDL { @@ -257,7 +257,7 @@ namespace JinEngine }; } // namespace SDL - } // namespace Audio + } // namespace Audio } // namespace JinEngine #endif // (jin_audio) && (jin_audio == jin_audio_sdl) diff --git a/src/libjin/audio/je_audio_manager.cpp b/src/libjin/audio/je_audio_manager.cpp index e451aa3..1fdc6ef 100644 --- a/src/libjin/audio/je_audio_manager.cpp +++ b/src/libjin/audio/je_audio_manager.cpp @@ -6,10 +6,10 @@ namespace JinEngine { - namespace Audio - { + namespace Audio + { - } // namespace Audio + } // namespace Audio } // namespace JinEngine #endif // jin_audio diff --git a/src/libjin/audio/je_audio_manager.h b/src/libjin/audio/je_audio_manager.h index e0c7a4b..cc6d65b 100644 --- a/src/libjin/audio/je_audio_manager.h +++ b/src/libjin/audio/je_audio_manager.h @@ -11,27 +11,27 @@ namespace JinEngine { - namespace Audio - { + namespace Audio + { - class Source; + class Source; /// /// Audio manager. /// - template<class SubAudio> - class AudioManager : public Subsystem<SubAudio> - { - public: + template<class SubAudio> + class AudioManager : public Subsystem<SubAudio> + { + public: /// /// Audio state. /// - enum State - { - PLAY , - STOP , - PAUSE, - }; + enum State + { + PLAY , + STOP , + PAUSE, + }; /// /// AudioManager constructor. @@ -49,35 +49,35 @@ namespace JinEngine /// /// Play all sources whose state is playing. /// - virtual void play() = 0; + virtual void play() = 0; /// /// Stop and remove all sources from the queue. /// - virtual void stop() = 0; + virtual void stop() = 0; /// /// Pause audio. /// - virtual void pause() = 0; + virtual void pause() = 0; /// /// Resume audio. /// - virtual void resume() = 0; + virtual void resume() = 0; /// /// Set global audio volume. /// - virtual void setVolume(float volume) = 0; + virtual void setVolume(float volume) = 0; - protected: - float volume; - State state; + protected: + float volume; + State state; - }; + }; - } // namespace Audio + } // namespace Audio } // namespace JinEngine #endif // jin_audio diff --git a/src/libjin/audio/je_source.cpp b/src/libjin/audio/je_source.cpp index 6bc1f4f..382e820 100644 --- a/src/libjin/audio/je_source.cpp +++ b/src/libjin/audio/je_source.cpp @@ -7,24 +7,24 @@ namespace JinEngine { - namespace Audio - { + namespace Audio + { - static int check_header(const void *data, int size, const char *str, int offset) { - int len = strlen(str); - return (size >= offset + len) && !memcmp((char*)data + offset, str, len); - } + static int check_header(const void *data, int size, const char *str, int offset) { + int len = strlen(str); + return (size >= offset + len) && !memcmp((char*)data + offset, str, len); + } - SourceType Source::getType(const void* mem, int size) - { - if(check_header(mem, size, "WAVE", 8)) - return SourceType::WAV; - if(check_header(mem, size, "OggS", 0)) - return SourceType::OGG; - return SourceType::INVALID; - } + SourceType Source::getType(const void* mem, int size) + { + if(check_header(mem, size, "WAVE", 8)) + return SourceType::WAV; + if(check_header(mem, size, "OggS", 0)) + return SourceType::OGG; + return SourceType::INVALID; + } - } // namespace Audio + } // namespace Audio } // namespace JinEngine #endif // jin_audio diff --git a/src/libjin/audio/je_source.h b/src/libjin/audio/je_source.h index 9b7bff0..fd78be5 100644 --- a/src/libjin/audio/je_source.h +++ b/src/libjin/audio/je_source.h @@ -9,34 +9,34 @@ namespace JinEngine { - namespace Audio - { + namespace Audio + { /// /// Audio source encoding type. /// - enum SourceType - { - INVALID = 0, - WAV, - OGG, - }; + enum SourceType + { + INVALID = 0, + WAV, + OGG, + }; /// /// Audio source. /// - class Source : public Object - { - public: + class Source : public Object + { + public: /// /// Source constructor. /// - Source() {}; + Source() {}; /// /// Source destructor. /// - virtual ~Source() {}; + virtual ~Source() {}; /// /// Start playing source. @@ -46,71 +46,71 @@ namespace JinEngine /// /// Stop playing source. /// - virtual void stop() = 0; + virtual void stop() = 0; /// /// Pause source. /// - virtual void pause() = 0; + virtual void pause() = 0; /// /// Resume source. /// - virtual void resume() = 0; + virtual void resume() = 0; /// /// Rewind source. /// - virtual void rewind() = 0; + virtual void rewind() = 0; /// /// Whether the source is playing or not. /// - virtual bool isStopped() const = 0; + virtual bool isStopped() const = 0; /// /// Whether the source is paused or not. /// - virtual bool isPaused() const = 0; + virtual bool isPaused() const = 0; /// /// Set source pitch. /// /// @param pitch Pitch of source. /// - virtual void setPitch(float pitch) = 0; + virtual void setPitch(float pitch) = 0; /// /// Set volume of source. /// /// @param volume Volume of source. /// - virtual void setVolume(float volume) = 0; + virtual void setVolume(float volume) = 0; /// /// Set source loop. /// /// @param loop Looping or not. /// - virtual void setLoop(bool loop) = 0; + virtual void setLoop(bool loop) = 0; /// /// Set source rate. /// /// @param rate Rate of source. /// - virtual void setRate(float rate) = 0; + virtual void setRate(float rate) = 0; - protected: + protected: /// /// Get type of source data. /// - static SourceType getType(const void* mem, int size); + static SourceType getType(const void* mem, int size); - }; + }; - } // namespace Audio + } // namespace Audio } // namespace JinEngine #endif // jin_audio |