Commit Graph

191 Commits

Author SHA1 Message Date
Max Horn
0e9c6de1c4 increased SmushMixer stream size to 500K, this seems to help in Fullthrottle. Apparently, audio data is streamed faster than it's played, and in at least one case there's ~500KB being stream in quick successions (many packets, each 16KB), which is why 100K are not sufficient
svn-id: r8784
2003-07-06 01:41:34 +00:00
Max Horn
5062bb06fa 100 KB instead of 2 MB audio buffer should be sufficient
svn-id: r8700
2003-07-02 00:53:38 +00:00
Max Horn
fe03de7243 fix for the 'invalid seeks' that sometimes occured at the end of smush playback (well I hope - at least now I can't reproduce the problem anymore with my testcases)
svn-id: r8695
2003-07-01 23:50:36 +00:00
Max Horn
f108fe66fe make smush pausing while GUI is up reentrant
svn-id: r8639
2003-06-22 23:09:56 +00:00
Max Horn
4ead10e4d5 Change names of the stream API in the mixer; added endStream method (stop() halts stream immediately; endStream() lets it first finish playing)
svn-id: r8603
2003-06-22 11:47:03 +00:00
Paweł Kołodziejski
21aa812bf1 fixed warning
svn-id: r8599
2003-06-22 06:27:32 +00:00
Max Horn
046dd1cfc8 fix regression I just introduced (voices in smush movies were cut off way too early)
svn-id: r8595
2003-06-22 01:33:03 +00:00
Max Horn
bd4370c251 lots of mixer cleanup / refactoring / reengineering
svn-id: r8594
2003-06-21 23:29:34 +00:00
Max Horn
7c332d7fdb modified & cleaned up the playStream/append code a bit; but this API really could stand some refinement
svn-id: r8592
2003-06-21 21:17:08 +00:00
Max Horn
1733bafbda get rid of 11025 Hz special case (I hope this is correct; only case I know of where 11025 Hz are used is during the Dig intro
svn-id: r8591
2003-06-21 20:57:01 +00:00
Max Horn
55e9f4ecbe got rid of member var 'first'
svn-id: r8590
2003-06-21 20:40:34 +00:00
Max Horn
ace2fff564 cleanup
svn-id: r8589
2003-06-21 20:33:46 +00:00
Max Horn
720837abd9 reduce code duplication a bit
svn-id: r8586
2003-06-21 19:58:38 +00:00
Max Horn
9548531b1c TODO: improved smush sound quality whenever 11khz sound is used
svn-id: r8585
2003-06-21 19:57:56 +00:00
Max Horn
b62e3c942f init _base to 0
svn-id: r8572
2003-06-20 11:21:53 +00:00
Max Horn
d659aa153a spelling
svn-id: r8547
2003-06-19 10:02:34 +00:00
Max Horn
ac23e56e85 cleanup; tiny bug fix (file was opened, then opened again - not good)
svn-id: r8539
2003-06-18 13:14:17 +00:00
Max Horn
101df28e0b moved GameId declaration to common/engine.h (more logical); moved scumm specific stuff from gameDetector.h to scumm.h; cleaned up some #includes (ideally, never #include something in a header file if you can avoid it - this cuts down interdepencies)
svn-id: r8496
2003-06-15 01:42:19 +00:00
Max Horn
f1fc68773d made stuff in class Sound protected where possible; moved readCreativeVocFile to imuse_digi.cpp and turned it into a static function; put the DigitalTrackInfo stuff into sound.cpp (keeping it private); removed #includes from sound.h (this cuts down interdependencies a little)
svn-id: r8493
2003-06-15 00:54:14 +00:00
Jonathan Gray
4f6573794b fix leak
svn-id: r8489
2003-06-15 00:07:24 +00:00
Max Horn
08e772dcf0 Fix for bug #751782 (Quitting during SMUSH movies doesn't always work)
svn-id: r8483
2003-06-14 20:55:09 +00:00
Max Horn
f7a8cbf7c7 Patch #754151: Removed READ_*_UNALIGNED and always read stuff bytewise; augmented by some more changes of mine
svn-id: r8482
2003-06-14 18:52:30 +00:00
Torbjörn Andersson
cff68f81fd Updated comment.
svn-id: r8428
2003-06-10 11:19:00 +00:00
Torbjörn Andersson
5813724a33 Fixed text-positioning regressions in the Full Throttle intro and in The
Dig's "Spacetime Six" movie.

Also rewrote drawStringCentered() to be more like drawStringAbsolute(). It
makes sense to me, but let me know if it causes any new regressions.

svn-id: r8415
2003-06-09 12:24:05 +00:00
Max Horn
b7ddc7bc57 allow quit during smush playback; cleanup
svn-id: r8411
2003-06-09 01:32:36 +00:00
Max Horn
faadbcafa7 cleanup; got rid of the split function and rather work in place (so instead of allocating dozens of small goblets of memory, we only need to duplicate the string once); fixed some text positioning bugs (but again, to get a real accurate implementation, I'll need to study screen shots of the Dig/FT/COMI videos and compare them to our results)
svn-id: r8388
2003-06-08 00:39:08 +00:00
Max Horn
f273c4195b cleanup
svn-id: r8387
2003-06-07 23:12:46 +00:00
Max Horn
3f39f7d909 cleanup and a few fixes for text positioning (but am not sure if it's fully correct now either; will have to compare smush subtitles we generate with those from the LEC engine)
svn-id: r8386
2003-06-07 22:58:29 +00:00
Max Horn
15d5ceffbd case 9 was drawStringCentered but should have been drawStringWrapCentered; cleanup
svn-id: r8385
2003-06-07 22:57:27 +00:00
Max Horn
55d3168c59 adhere to our coding style conventions; removed some unneccessary code
svn-id: r8376
2003-06-07 00:45:32 +00:00
Max Horn
4303edcbbd make SmushFont inherit from NutRenderer (TODO: drawChar stuff should be unified, too)
svn-id: r8375
2003-06-07 00:33:46 +00:00
Max Horn
b4da713bfd some more cleanup
svn-id: r8304
2003-06-04 23:51:25 +00:00
Max Horn
565a100c83 some cleanup & refactoring (CJK fonts have proper shadows now, for example); preparations to merge NutRenderer and SmushFont
svn-id: r8303
2003-06-04 23:32:09 +00:00
Paweł Kołodziejski
55abd7d5ec fixed compilation for vc6
svn-id: r8299
2003-06-04 20:20:50 +00:00
Paweł Kołodziejski
ad04b310bc fix warning
svn-id: r8298
2003-06-04 20:13:16 +00:00
Max Horn
ac57e79ca2 cleanup
svn-id: r8294
2003-06-04 15:04:00 +00:00
Max Horn
6fd0e4a07f Patch #747021: DIG&CMI 2 byte charset support (very heavily modified by me; still needs more cleanup but already works well enough)
svn-id: r8293
2003-06-04 14:37:43 +00:00
Max Horn
1f38765c16 use decompressBomp instead of smush_decode_codec1
svn-id: r8153
2003-05-30 19:28:52 +00:00
Max Horn
c6b35e15a0 moved bomp stuff into own files; removed some of our 6 (!) bomp decoders
svn-id: r8151
2003-05-30 19:00:33 +00:00
Max Horn
c2ea35fe07 Make _smushProcessFrame volatile (for multi thread access)
svn-id: r8016
2003-05-26 19:57:00 +00:00
Max Horn
80df4a8a00 renamed ContChunk -> MemoryChunk; avoid code duplication by introducing BaseChunk
svn-id: r7935
2003-05-25 11:39:08 +00:00
Max Horn
cc2f0e6343 yet more pedantic warning fixes
svn-id: r7796
2003-05-21 18:16:01 +00:00
Max Horn
49e7f7564a renamed various things for clarity
svn-id: r7754
2003-05-20 20:58:26 +00:00
Max Horn
5ac005860c warning() automatically outputs a newline after the warning message; adding a newline into the format string adds another newline (which contains the single char '!')
svn-id: r7647
2003-05-18 21:14:50 +00:00
Max Horn
81bfe8cd51 swapped talkPosX and talkPosY (they were misnamed); factored out some duplicate code in string.cpp; VC warning fix in smush_player.cpp
svn-id: r7481
2003-05-12 22:08:39 +00:00
Max Horn
acb35fc915 renamed _scrWidth/_scrHeight -> _roomWidht/_roomHeight, and _realWidth/_realHeight -> _screenWidth/_screenHeight (inspired by MadMoose, but I'll take the blame - still this seems much more logical & intuitive)
svn-id: r7423
2003-05-10 21:49:59 +00:00
Max Horn
feab6f904f moved screen mutex from smush into SDL backend (other backends have to make sure they are thread safe by themselves)
svn-id: r7230
2003-04-30 19:11:33 +00:00
Jonathan Gray
79ebda7613 compilation fix
svn-id: r7218
2003-04-30 11:34:05 +00:00
Max Horn
1be2d3076f som changes to make Palm OS happy
svn-id: r7216
2003-04-30 11:26:36 +00:00
Max Horn
b617227723 fixed endian regression (introduced by the alignment changes)
svn-id: r7127
2003-04-26 11:02:49 +00:00