X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsoundscape.cpp;h=e12f39befacded7c6fe2809100e012e5e91e77dc;hb=14008b157c64752ba7c1cef831124992c35c4646;hp=6ec00f06b9113909ff6e20d4bb976836b758095f;hpb=8e69eba7dc53233c169152bdf654f032fcd0629f;p=libs%2Fal.git diff --git a/source/soundscape.cpp b/source/soundscape.cpp index 6ec00f0..e12f39b 100644 --- a/source/soundscape.cpp +++ b/source/soundscape.cpp @@ -1,10 +1,3 @@ -/* $Id$ - -This file is part of libmspal -Copyright © 2008 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #include "source.h" #include "soundscape.h" @@ -19,19 +12,19 @@ SoundScape::~SoundScape() delete *i; } -void SoundScape::add_source(Source *src) +void SoundScape::add_source(Source &src) { - sources.push_back(src); + sources.push_back(&src); } -Source *SoundScape::play(const Buffer &buf, float x, float y, float z) +Source &SoundScape::play(const Buffer &buf, float x, float y, float z) { - Source *src=new Source; - add_source(src); + Source *src = new Source; + add_source(*src); src->set_buffer(buf); src->set_position(x, y, z); src->play(); - return src; + return *src; } void SoundScape::tick() @@ -41,7 +34,7 @@ void SoundScape::tick() if((*i)->get_state()==STOPPED) { delete *i; - i=sources.erase(i); + i = sources.erase(i); } else ++i;