diff options
Diffstat (limited to 'src/sound.h')
| -rw-r--r-- | src/sound.h | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/src/sound.h b/src/sound.h index bf5dc3f6..032ff62b 100644 --- a/src/sound.h +++ b/src/sound.h @@ -68,16 +68,25 @@ class Sound * @param path The full path to the music file. * @param ms Duration of fade-in effect (ms) */ - void fadeInMusic(const std::string &path, int ms = 2000); + void fadeInMusic(const std::string &path, int ms = 1000); /** * Fades out currently running background music track. * * @param ms Duration of fade-out effect (ms) */ - void fadeOutMusic(int ms); + void fadeOutMusic(int ms = 1000); - int getMaxVolume() const; + /** + * Fades out a background music and play a new one. + * + * @param path The full path to the fade in music file. + * @param ms Duration of fade-out effect (ms) + */ + void fadeOutAndPlayMusic(const std::string &path, int ms = 1000); + + int getMaxVolume() const + { return MIX_MAX_VOLUME; } void setMusicVolume(int volume); void setSfxVolume(int volume); @@ -86,8 +95,17 @@ class Sound * Plays an item. * * @param path The resource path to the sound file. + * @param x The vertical distance of the sound in pixels. + * @param y The horizontal distance of the sound in pixels. */ - void playSfx(const std::string &path); + void playSfx(const std::string &path, int x = 0, int y = 0); + + /** + * The sound logic. + * Currently used to check whether the music file can be freed after + * a fade out, and whether new music has to be played. + */ + void logic(); private: /** Logs various info about sound device. */ @@ -96,6 +114,12 @@ class Sound /** Halts and frees currently playing music. */ void haltMusic(); + /** + * When calling fadeOutAndPlayMusic(), + * the music file below will then be played + */ + std::string mNextMusicPath; + bool mInstalled; int mSfxVolume; |