projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switched magnification to percentage, added black-border as alternative to scale
[supertux.git]
/
src
/
audio
/
sound_manager.hpp
diff --git
a/src/audio/sound_manager.hpp
b/src/audio/sound_manager.hpp
index
88f2437
..
12f1944
100644
(file)
--- a/
src/audio/sound_manager.hpp
+++ b/
src/audio/sound_manager.hpp
@@
-23,13
+23,20
@@
#include <vector>
#include <map>
#include <vector>
#include <map>
+#ifndef MACOSX
#include <AL/alc.h>
#include <AL/al.h>
#include <AL/alc.h>
#include <AL/al.h>
+#else
+#include <OpenAL/alc.h>
+#include <OpenAL/al.h>
+#endif
+
#include "math/vector.hpp"
class SoundFile;
class SoundSource;
class StreamSoundSource;
#include "math/vector.hpp"
class SoundFile;
class SoundSource;
class StreamSoundSource;
+class OpenALSoundSource;
class SoundManager
{
class SoundManager
{
@@
-42,15
+49,18
@@
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);
/**
* Convenience function to simply play a sound at a given position.
*/
void play(const std::string& name, const Vector& pos = Vector(-1, -1));
*/
SoundSource* create_sound_source(const std::string& filename);
/**
* Convenience function to simply play a sound at a given position.
*/
void play(const std::string& name, const Vector& pos = Vector(-1, -1));
- void play_and_delete(SoundSource* source);
+ /**
+ * Adds the source to the list of managed sources (= the source gets deleted
+ * when it finished playing)
+ */
+ void manage_source(SoundSource* source);
/// preloads a sound, so that you don't get a lag later when playing it
void preload(const std::string& name);
/// preloads a sound, so that you don't get a lag later when playing it
void preload(const std::string& name);
@@
-61,19
+71,30
@@
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() {
-
return (device == 0 || context == 0 ? false : true)
;
+
return device != 0 && context != 0
;
}
void update();
}
void update();
+ /*
+ * Tell soundmanager to call update() for stream_sound_source.
+ */
+ void register_for_update( StreamSoundSource* sss );
+ /*
+ * Unsubscribe from updates for stream_sound_source.
+ */
+ void remove_from_update( StreamSoundSource* sss );
+
private:
private:
- friend class SoundSource;
+ friend class
OpenAL
SoundSource;
friend class StreamSoundSource;
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);
@@
-87,9
+108,12
@@
private:
typedef std::map<std::string, ALuint> SoundBuffers;
SoundBuffers buffers;
typedef std::map<std::string, ALuint> SoundBuffers;
SoundBuffers buffers;
- typedef std::vector<SoundSource*> SoundSources;
+ typedef std::vector<
OpenAL
SoundSource*> SoundSources;
SoundSources sources;
SoundSources sources;
+ typedef std::vector<StreamSoundSource*> StreamSoundSources;
+ StreamSoundSources update_list;
+
StreamSoundSource* music_source;
bool music_enabled;
StreamSoundSource* music_source;
bool music_enabled;
@@
-99,4
+123,3
@@
private:
extern SoundManager* sound_manager;
#endif
extern SoundManager* sound_manager;
#endif
-