X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsource.cpp;h=df3063ce50e909c156b5d2322745d7d40f4eb6d5;hb=12d27761bc8a24677b52a67bff0e8cbfca14a902;hp=3619b1d61205c9128d0ffb87d7e66909acf738f2;hpb=58dc1e7c15f928d0f861a20c46f2be4112bf5baf;p=libs%2Fal.git

diff --git a/source/source.cpp b/source/source.cpp
index 3619b1d..df3063c 100644
--- a/source/source.cpp
+++ b/source/source.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspal
-Copyright © 2008 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "buffer.h"
 #include "source.h"
 
@@ -23,70 +16,41 @@ Source::~Source()
 	alDeleteSources(1, &id);
 }
 
-void Source::attribute(ALenum attr, int v)
-{
-	alSourcei(id, attr, v);
-}
-
-void Source::attribute(ALenum attr, float v)
-{
-	alSourcef(id, attr, v);
-}
-
-void Source::attribute(ALenum attr, float v0, float v1, float v2)
-{
-	alSource3f(id, attr, v0, v1, v2);
-}
-
-void Source::attribute(ALenum attr, const float *v)
-{
-	alSourcefv(id, attr, v);
-}
-
-void Source::get_attribute(ALenum attr, int *v) const
-{
-	alGetSourcei(id, attr, v);
-}
-
-void Source::get_attribute(ALenum attr, float *v) const
+SourceState Source::get_state() const
 {
-	alGetSourcef(id, attr, v);
+	int state = INITIAL;
+	alGetSourcei(id, AL_SOURCE_STATE, &state);
+	return static_cast<SourceState>(state);
 }
 
-SourceState Source::get_state() const
+void Source::set_position(float x, float y, float z)
 {
-	int state;
-	get_attribute(AL_SOURCE_STATE, &state);
-	return static_cast<SourceState>(state);
+	alSource3f(id, AL_POSITION, x, y, z);
 }
 
-unsigned Source::get_buffers_queued() const
+void Source::set_velocity(float x, float y, float z)
 {
-	int n;
-	get_attribute(AL_BUFFERS_QUEUED, &n);
-	return n;
+	alSource3f(id, AL_VELOCITY, x, y, z);
 }
 
-unsigned Source::get_buffers_processed() const
+void Source::set_looping(bool l)
 {
-	int n;
-	get_attribute(AL_BUFFERS_PROCESSED, &n);
-	return n;
+	alSourcei(id, AL_LOOPING, l);
 }
 
-void Source::set_position(float x, float y, float z)
+void Source::set_gain(float g)
 {
-	attribute(AL_POSITION, x, y, z);
+	alSourcef(id, AL_GAIN, g);
 }
 
-void Source::set_looping(bool l)
+void Source::set_rolloff_factor(float f)
 {
-	attribute(AL_LOOPING, l);
+	alSourcef(id, AL_ROLLOFF_FACTOR, f);
 }
 
 void Source::set_buffer(const Buffer &buffer)
 {
-	attribute(AL_BUFFER, static_cast<int>(buffer.get_id()));
+	alSourcei(id, AL_BUFFER, buffer.get_id());
 }
 
 void Source::queue_buffers(const vector<const Buffer *> &buffers)
@@ -100,7 +64,7 @@ void Source::queue_buffers(const vector<const Buffer *> &buffers)
 
 void Source::queue_buffer(const Buffer &buffer)
 {
-	uint bid=buffer.get_id();
+	uint bid = buffer.get_id();
 	alSourceQueueBuffers(id, 1, &bid);
 }
 
@@ -115,13 +79,27 @@ void Source::unqueue_buffers(const vector<const Buffer *> &buffers)
 
 void Source::unqueue_buffer(const Buffer &buffer)
 {
-	uint bid=buffer.get_id();
+	uint bid = buffer.get_id();
 	alSourceUnqueueBuffers(id, 1, &bid);
 }
 
 void Source::clear_buffers()
 {
-	attribute(AL_BUFFER, AL_NONE);
+	alSourcei(id, AL_BUFFER, AL_NONE);
+}
+
+unsigned Source::get_buffers_queued() const
+{
+	int n = 0;
+	alGetSourceiv(id, AL_BUFFERS_QUEUED, &n);
+	return n;
+}
+
+unsigned Source::get_buffers_processed() const
+{
+	int n = 0;
+	alGetSourceiv(id, AL_BUFFERS_PROCESSED, &n);
+	return n;
 }
 
 void Source::play()