Max Horn
f67b126f1d
replace code in readBuffer by slightly less efficient but hopefully working 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-07 22:19:55 +00:00
Jamieson Christian
d8464534a5
Added comment to new macro
...
svn-id: r9581
2003-08-06 20:44:42 +00:00
Jamieson Christian
99716fc38e
Changed readSample template function
...
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-06 20:41:05 +00:00
Chris Apers
1a0d308e04
Fixed type mismatch error compiling palmos port
...
svn-id: r9552
2003-08-06 11:53:18 +00:00
Max Horn
7ff88ea392
more cleanup
...
svn-id: r9513
2003-08-05 18:17:26 +00:00
Max Horn
79fd7ee441
cleanup
...
svn-id: r9512
2003-08-05 18:12:59 +00:00
Max Horn
4c4aa4e957
fix bug #783423
...
svn-id: r9484
2003-08-05 11:30:13 +00:00
Max Horn
74188e6143
and finally VorbisInputStream::readBuffer. Once we verified the new 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-05 01:22:09 +00:00
Max Horn
1de064ee2c
optimized MP3InputStream::readBuffer (once more, I won't gurantee for correctness although it seems to work fine over here)
...
svn-id: r9475
2003-08-05 01:14:27 +00:00
Max Horn
154ca4f2cf
simplified code a bit
...
svn-id: r9474
2003-08-05 00:53:25 +00:00
Max Horn
b1d3b7ab99
optimized WrappedMemoryStream::readBuffer (It's almost 3 AM, so I don't trust myself, hence I'll leave this as an #ifdef for now :-)
...
svn-id: r9473
2003-08-05 00:50:15 +00:00
Max Horn
b96e5501e6
catch one potential problem, namely if eos is already reached when readBuffer is called ('This should never happen anyway', famous last words)
...
svn-id: r9472
2003-08-05 00:31:00 +00:00
Max Horn
d280258e09
renamed eof -> eos (end of stream); hid MP3/Vorbis stream classes completly (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-04 22:15:16 +00:00
Max Horn
996d4f1391
fixed EOF handling of MP3 streams (subtract time from duration timer, instead of adding it...)
...
svn-id: r9464
2003-08-04 16:28:41 +00:00
Max Horn
c373ca107d
slightly optimized MP3InputStream::eof, and some cleanup
...
svn-id: r9422
2003-08-02 18:13:37 +00:00
Max Horn
cc8465aa71
don't use asserts in these tight spots
...
svn-id: r9420
2003-08-02 17:27:17 +00:00
Max Horn
1f58fea232
converted ChannelMP3 to use new rate conversion scheme, too. Only thing 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-02 02:41:31 +00:00
Max Horn
1cfa9d9029
let the input stream handle the looping (by pretending to be of infinite size -> this fixes a problem which cause 'gaps' at loop turn-over points)
...
svn-id: r9379
2003-08-01 16:32:11 +00:00
Max Horn
d9bd77032a
implemented raw sound looping; some debug output enabled temporarily
...
svn-id: r9360
2003-08-01 12:49:24 +00:00
Max Horn
d8494d658b
fixed MP3InputStream, now seems to work properly (kind of a surprise)
...
svn-id: r9345
2003-07-31 19:32:38 +00:00
Paweł Kołodziejski
e5e117006a
back disable warnings into stdafx.h, vc6 is lack of warnings support
...
svn-id: r9337
2003-07-31 18:35:01 +00:00
Jamieson Christian
c5de745580
Disabled unknown pragma warning in MSVC-6.
...
svn-id: r9320
2003-07-31 06:47:05 +00:00
Max Horn
9b2d4f92aa
removed the AudioInputStream::size method -> only eof() is really needed, and this can be implemented more efficiently stand-alone; implemented MP3InputStream (work in progress)
...
svn-id: r9313
2003-07-31 01:21:38 +00:00
Max Horn
6143058422
fixed incorrect MSVC fixes; simplified readSample code (bugs #780167 and #780420 )
...
svn-id: r9302
2003-07-30 19:43:51 +00:00
Max Horn
26d05c0190
the VC warning for unknown pragmas is now gloabally disabled, no need to work around it locally
...
svn-id: r9300
2003-07-30 18:40:28 +00:00
Jamieson Christian
20d06e2c3d
Fixed MSVC errors
...
svn-id: r9288
2003-07-30 09:26:54 +00:00
Max Horn
6b470390f7
cleanup
...
svn-id: r9281
2003-07-29 12:39:41 +00:00
Max Horn
45ebcdbde1
account for the data in the _buffer, too
...
svn-id: r9276
2003-07-29 03:02:25 +00:00
Max Horn
77eb284062
added VorbisInputStream
...
svn-id: r9271
2003-07-29 01:37:03 +00:00
Max Horn
c6a4a1d37d
make wrapped stream work (I can hear some music in CoMI now before it segfaults :-)
...
svn-id: r9258
2003-07-28 18:01:56 +00:00
Max Horn
13eee4b06f
rewrote the input streams, this should be more straightforward and inline 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-28 17:28:29 +00:00
Max Horn
7ea67048c1
more work on WrappedMemoryStream (not yet tested)
...
svn-id: r9253
2003-07-28 16:55:43 +00:00
Max Horn
9e051fa507
instead of 'int channels', use 'bool stereo' (less extensible, but then I 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-28 11:13:01 +00:00
Max Horn
e87bc6d89e
use a single converter for both channels (if input data is stereo), for 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-28 01:13:31 +00:00
Max Horn
c520d2d423
move AudioInputStream implementations & makeInputStream into separate .cpp file
...
svn-id: r9190
2003-07-25 13:42:05 +00:00
