projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make OpenAL header inclusion more portable
[supertux.git]
/
src
/
audio
/
sound_manager.hpp
diff --git
a/src/audio/sound_manager.hpp
b/src/audio/sound_manager.hpp
index
657ca06
..
921b859
100644
(file)
--- a/
src/audio/sound_manager.hpp
+++ b/
src/audio/sound_manager.hpp
@@
-23,8
+23,8
@@
#include <vector>
#include <map>
#include <vector>
#include <map>
-#include <
AL/
alc.h>
-#include <
AL/
al.h>
+#include <alc.h>
+#include <al.h>
#include "math/vector.hpp"
class SoundFile;
#include "math/vector.hpp"
class SoundFile;
@@
-43,8
+43,7
@@
public:
* Creates a new sound source object which plays the specified soundfile.
* You are responsible for deleting the sound source later (this will stop the
* sound).
* Creates a new sound source object which plays the specified soundfile.
* You are responsible for deleting the sound source later (this will stop the
* sound).
- * This function might throw exceptions. It returns 0 if no audio device is
- * available.
+ * This function never throws exceptions, but might return a DummySoundSource
*/
SoundSource* create_sound_source(const std::string& filename);
/**
*/
SoundSource* create_sound_source(const std::string& filename);
/**
@@
-70,7
+69,7
@@
public:
bool is_sound_enabled() { return sound_enabled; }
bool is_audio_enabled() {
bool is_sound_enabled() { return sound_enabled; }
bool is_audio_enabled() {
-
return (device == 0 || context == 0 ? false : true)
;
+
return device != 0 && context != 0
;
}
void update();
}
void update();
@@
-88,6
+87,8
@@
private:
friend class OpenALSoundSource;
friend class StreamSoundSource;
friend class OpenALSoundSource;
friend class StreamSoundSource;
+ /** creates a new sound source, might throw exceptions, never returns NULL */
+ OpenALSoundSource* intern_create_sound_source(const std::string& filename);
static ALuint load_file_into_buffer(SoundFile* file);
static ALenum get_sample_format(SoundFile* file);
static ALuint load_file_into_buffer(SoundFile* file);
static ALenum get_sample_format(SoundFile* file);