LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-18 11:44:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Major developments to love.audio/love.sound. Music and Sound are gone. There are only Sources now, which is much cleaner.

Browse Source 
The audio module was not really stable in 0.6.0, it takes very little messing around to cause OpenAL to do horrible things. It should now be much more stable,
and you *should* be able to play/stop/pause/resume/rewind/loop like a madman without disasters. Seek and tell, however, are still not tested and verified for
all decoders, but that's less important. Also, all objects now have object:type() and object:typeOf(), which returns the type name of the object,
and checks whether an object is of a certain type, respectively.
This commit is contained in:
rude
2010-01-31 11:52:54 +01:00
parent 8e74574544
commit 5b30c7fcfe
51 changed files with 894 additions and 1693 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/audio/openal/Pool.h
+15 -23
View File
@@ -31,7 +31,6 @@
#include <SDL.h>
// LOVE
#include <audio/Source.h>
#include <common/config.h>
#include <common/Exception.h>
@@ -50,6 +49,9 @@ namespace audio
{
namespace openal
{
class Source;
class Pool
{
private:
@@ -64,7 +66,7 @@ namespace openal
std::queue<ALuint> available;
// A map of playing sources.
std::map<love::audio::Source *, ALuint> playing;
std::map<Source *, ALuint> playing;
// Only one thread can access this object at the same time. This mutex will
// make sure of that.
@@ -75,15 +77,6 @@ namespace openal
Pool();
~Pool();
/**
* Gets the OpenAL format identifier based on number of
* channels and bits.
* @param channels Either 1 (mono) or 2 (stereo).
* @param bits Either 8-bit samples, or 16-bit samples.
* @return One of AL_FORMAT_*, or 0 if unsupported format.
**/
ALenum getFormat(int channels, int bits) const;
/**
* Checks whether an OpenAL source is available.
* @return True if at least one is available, false otherwise.
@@ -93,26 +86,22 @@ namespace openal
/**
* Checks whether a Source is currently in the playing list.
**/
bool isPlaying(love::audio::Source * s);
/**
* Returns an available OpenAL source identifier, or 0 if
* none is available.
* @return An OpenAL source ID, or 0 if unavailable.
**/
ALuint claim(love::audio::Source * source);
ALuint find(const love::audio::Source * source) const;
bool isPlaying(Source * s);
void update();
int getNumSources() const;
int getMaxSources() const;
bool play(Source * source, ALuint & out);
void stop();
void stop(Source * source);
void pause();
void pause(Source * source);
void resume();
void resume(Source * source);
void rewind();
void rewind(Source * source);
private:
@@ -120,9 +109,12 @@ namespace openal
* Makes the specified OpenAL source available for use.
* @param source The OpenAL source.
**/
void release(love::audio::Source * source);
void release(Source * source);
ALuint findi(const love::audio::Source * source) const;
ALuint findi(const Source * source) const;
bool findSource(Source * source, ALuint & out);
bool removeSource(Source * source);
}; // Pool
} // openal