X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstreamer.cpp;h=2c2619bbed8667a93fd54959b0a246733da680e5;hb=14008b157c64752ba7c1cef831124992c35c4646;hp=8fe7483cc735ffbc5fab4dfa3c8185b35fc5044d;hpb=bb3f1a84f09963031a88175c4f44c872d508447b;p=libs%2Fal.git diff --git a/source/streamer.cpp b/source/streamer.cpp index 8fe7483..2c2619b 100644 --- a/source/streamer.cpp +++ b/source/streamer.cpp @@ -1,10 +1,3 @@ -/* $Id$ - -This file is part of libmspal -Copyright © 2008-2009 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #include "buffer.h" #include "sound.h" #include "streamer.h" @@ -29,20 +22,20 @@ Streamer::~Streamer() void Streamer::play(Sound &s) { - snd=&s; + snd = &s; tick(); src.play(); } void Streamer::stop() { - snd=0; + snd = 0; src.stop(); } void Streamer::tick() { - if(unsigned n=src.get_buffers_processed()) + if(unsigned n = src.get_buffers_processed()) { for(unsigned i=0; iget_frequency(); - unsigned chunk_size=freq&~0xF; - unsigned queued=src.get_buffers_queued(); + unsigned freq = snd->get_frequency(); + unsigned chunk_size = freq&~0xF; + unsigned queued = src.get_buffers_queued(); for(unsigned i=queued; i<4; ++i) { char data[chunk_size]; - unsigned pos=0; + unsigned pos = 0; while(posread(data+pos, chunk_size-pos); + unsigned len = snd->read(data+pos, chunk_size-pos); if(len==0) break; - pos+=len; + pos += len; } if(pos) { - Buffer *buf=new Buffer; + Buffer *buf = new Buffer; buf->data(snd->get_format(), data, pos, freq); src.queue_buffer(*buf); buffers.push_back(buf); @@ -83,7 +76,7 @@ void Streamer::tick() } if(snd->eof()) - snd=0; + snd = 0; } } // namespace AL