aboutsummaryrefslogtreecommitdiff
path: root/sound/audiostream.cpp
AgeCommit message (Collapse)Author
2003-12-19o Moved MP3 and Vorbis input streams to mp3.* resp. vorbis.*Max Horn
o Added SoundMixer::playInputStream and made some of the other play* methods use it o Added ProcInputStream stub (not working yet) which one day may allow us to replace the premix code, and allow other fancy stuff o Remove AudioInputStream::readBuffer default implementation (subclasses should always provide it for max. performance) o Some minor cleanup svn-id: r11754
2003-12-19fix for recent audio stream regressionMax Horn
svn-id: r11752
2003-12-17Made sure that *all* AudioInputStream 'know' their sample rate; removed ↵Max Horn
pointless MusicStream class; removed various specific Channel subclasses and instead generalized the base class some more svn-id: r11699
2003-12-17changed the way 'streams' are handled: the finalization logic is now in the ↵Max Horn
WrappedAudioInputStream; this allows further streamlining of the channel/mixer code (can you already guess what I am working towards? :-) svn-id: r11696
2003-12-17some cleanupMax Horn
svn-id: r11694
2003-12-16added mixer flag for little endian samplesRobert Göffringmann
svn-id: r11665
2003-12-09small tweak/fix (?)Max Horn
svn-id: r11541
2003-11-08cleanup whitespacesPaweł Kołodziejski
svn-id: r11221
2003-09-18moved engine.* to base; this fixes some linking issues when building a ↵Max Horn
barebone ScummVM (or maybe I just want to increase our CVS stats? <g>) svn-id: r10287
2003-09-09Up debug level of this warning, since it floods output in loomTravis Howell
svn-id: r10131
2003-08-24small cleanup for the Ogg playback codeMax Horn
svn-id: r9852
2003-08-07my code was actually right. Rather the calling code is evil, it passes us ↵Max Horn
odd buffer sizes for 16 bit audio data, which of course made no sense -> I added some asserts against this svn-id: r9590
2003-08-07replace code in readBuffer by slightly less efficient but hopefully working ↵Max Horn
code (at least it fixes an endless loop in COMI for me). I did fix the originaly bug in my optimization, and right now I clueless as to why that code isn't working as it should <sigh>. Need sleep svn-id: r9588
2003-08-06Added comment to new macroJamieson Christian
svn-id: r9581
2003-08-06Changed readSample template functionJamieson Christian
to Fingolfin's new READSAMPLE macro. Circumvents buggy template function handling in MSVC6. Props to Fingolfin for tracking this bug down by remote. svn-id: r9580
2003-08-06Fixed type mismatch error compiling palmos portChris Apers
svn-id: r9552
2003-08-05more cleanupMax Horn
svn-id: r9513
2003-08-05cleanupMax Horn
svn-id: r9512
2003-08-05fix bug #783423Max Horn
svn-id: r9484
2003-08-05and finally VorbisInputStream::readBuffer. Once we verified the new ↵Max Horn
readBuffer methods all work, we can get rid of readIntern again and merge those back into the regular read() methods svn-id: r9476
2003-08-05optimized MP3InputStream::readBuffer (once more, I won't gurantee for ↵Max Horn
correctness although it seems to work fine over here) svn-id: r9475
2003-08-05simplified code a bitMax Horn
svn-id: r9474
2003-08-05optimized WrappedMemoryStream::readBuffer (It's almost 3 AM, so I don't ↵Max Horn
trust myself, hence I'll leave this as an #ifdef for now :-) svn-id: r9473
2003-08-05catch one potential problem, namely if eos is already reached when ↵Max Horn
readBuffer is called ('This should never happen anyway', famous last words) svn-id: r9472
2003-08-04renamed eof -> eos (end of stream); hid MP3/Vorbis stream classes completly ↵Max Horn
(by providing factory methods); new readBuffer method for AudioInputStream for improved speed of the mixer; new MusicStream class (subclassed for MP3/Vorbis sound) which offers a getRate method; some other tweaks svn-id: r9467
2003-08-04fixed EOF handling of MP3 streams (subtract time from duration timer, ↵Max Horn
instead of adding it...) svn-id: r9464
2003-08-02slightly optimized MP3InputStream::eof, and some cleanupMax Horn
svn-id: r9422
2003-08-02don't use asserts in these tight spotsMax Horn
svn-id: r9420
2003-08-02converted ChannelMP3 to use new rate conversion scheme, too. Only thing ↵Max Horn
missing now is FLAG_REVERSE_STEREO support (and of course fixing regressions, and the long term goal is to make resample.cpp usable, too) svn-id: r9395
2003-08-01let the input stream handle the looping (by pretending to be of infinite ↵Max Horn
size -> this fixes a problem which cause 'gaps' at loop turn-over points) svn-id: r9379
2003-08-01implemented raw sound looping; some debug output enabled temporarilyMax Horn
svn-id: r9360
2003-07-31fixed MP3InputStream, now seems to work properly (kind of a surprise)Max Horn
svn-id: r9345
2003-07-31back disable warnings into stdafx.h, vc6 is lack of warnings supportPaweł Kołodziejski
svn-id: r9337
2003-07-31Disabled unknown pragma warning in MSVC-6.Jamieson Christian
svn-id: r9320
2003-07-31removed the AudioInputStream::size method -> only eof() is really needed, ↵Max Horn
and this can be implemented more efficiently stand-alone; implemented MP3InputStream (work in progress) svn-id: r9313
2003-07-30fixed incorrect MSVC fixes; simplified readSample code (bugs #780167 and ↵Max Horn
#780420) svn-id: r9302
2003-07-30the VC warning for unknown pragmas is now gloabally disabled, no need to ↵Max Horn
work around it locally svn-id: r9300
2003-07-30Fixed MSVC errorsJamieson Christian
svn-id: r9288
2003-07-29cleanupMax Horn
svn-id: r9281
2003-07-29account for the data in the _buffer, tooMax Horn
svn-id: r9276
2003-07-29added VorbisInputStreamMax Horn
svn-id: r9271
2003-07-28make wrapped stream work (I can hear some music in CoMI now before it ↵Max Horn
segfaults :-) svn-id: r9258
2003-07-28rewrote the input streams, this should be more straightforward and inline ↵Max Horn
slightly better (the fact that the main AudioInputStream methods are virtual still means that no inlining can take place there; but of course, if we did change that, all the rate converters would have to exist in 8, instead of currently 2, compiled versions) svn-id: r9256
2003-07-28more work on WrappedMemoryStream (not yet tested)Max Horn
svn-id: r9253
2003-07-28instead of 'int channels', use 'bool stereo' (less extensible, but then I ↵Max Horn
don't think we'll ever support 5.1 sound :-)); fixed a bug in st_rate_flow where it sometimes would overflow the output buffer; made CopyRateConverter a template, too, increasing efficency svn-id: r9239
2003-07-28use a single converter for both channels (if input data is stereo), for ↵Max Horn
improved efficency; renamed MemoryAudioInputStream -> LinearMemoryStream and use some template voodoo to make the baseclass of Input8bitSignedStream etc. variable; added (commented out) draf of WrappedMemoryStream svn-id: r9209
2003-07-25move AudioInputStream implementations & makeInputStream into separate .cpp fileMax Horn
svn-id: r9190