projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix cr/lfs and remove trailing whitespaces...
[supertux.git]
/
src
/
audio
/
sound_manager.hpp
diff --git
a/src/audio/sound_manager.hpp
b/src/audio/sound_manager.hpp
index
153bf36
..
657ca06
100644
(file)
--- a/
src/audio/sound_manager.hpp
+++ b/
src/audio/sound_manager.hpp
@@
-66,7
+66,7
@@
public:
void play_music(const std::string& filename, bool fade = false);
void stop_music(float fadetime = 0);
void play_music(const std::string& filename, bool fade = false);
void stop_music(float fadetime = 0);
- bool is_music_enabled() { return music_enabled; }
+ bool is_music_enabled() { return music_enabled; }
bool is_sound_enabled() { return sound_enabled; }
bool is_audio_enabled() {
bool is_sound_enabled() { return sound_enabled; }
bool is_audio_enabled() {
@@
-74,7
+74,7
@@
public:
}
void update();
}
void update();
-
+
/*
* Tell soundmanager to call update() for stream_sound_source.
*/
/*
* Tell soundmanager to call update() for stream_sound_source.
*/
@@
-116,4
+116,3
@@
private:
extern SoundManager* sound_manager;
#endif
extern SoundManager* sound_manager;
#endif
-