Commit Graph

362 Commits

Author SHA1 Message Date
Travis Howell
994769ec16 Still needed, mixed up block types.
svn-id: r17344
2005-04-03 06:40:44 +00:00
Travis Howell
d7b6860730 Removed reinit() and replaced with offsets of zero. We only need to skip type/size.
Removed AnimHeader check in parseNextFrame() and _skipPalette, since AnimHeader is correctly skipped when required now.

svn-id: r17343
2005-04-03 06:27:44 +00:00
Torbjörn Andersson
1d87cdb497 _data is a ScummFile, not a chunk, so it should use SEEK_SET, not
seek_start. And since SEEK_SET is the default seek mode, it doesn't make
any difference anyway.

svn-id: r17338
2005-04-02 17:26:18 +00:00
Travis Howell
4c50afea57 Seek from start pos, not cur pos.
svn-id: r17330
2005-04-01 22:36:45 +00:00
Travis Howell
ae30e1b9db Checked code against disasm., an offset of 8 is correct when rewinding san via INSANE.
svn-id: r17328
2005-04-01 15:33:18 +00:00
Nicolas Bacca
5a7c9f7d74 Tweak WinCE timer re-entry workaround to play Insane sequences
svn-id: r17242
2005-03-26 13:24:53 +00:00
Max Horn
7cd2cb2b17 PlayingSoundHandle -> SoundHandle; also, turned the handle activity check into a mixer method
svn-id: r17106
2005-03-12 18:56:09 +00:00
Max Horn
0ec193b4be changing AudioDataType -> SoundType, so now the constant names match the name of the data type / the SoundMixer method names
svn-id: r17052
2005-03-09 18:12:54 +00:00
Max Horn
13b8f678fc Fix one potential race condition between SMUSH and INSANE
svn-id: r17051
2005-03-09 16:37:44 +00:00
Max Horn
7dd8a39ad0 Allocate new file objects (and real new file handles) for subchunks/subfiles -- this might (or might not) help some of the odd bugs in FT... testing, esp. on Windows, is needed
svn-id: r17018
2005-03-07 00:38:18 +00:00
Max Horn
e7b8a1eada Added consts (this usually helps the compiler a bit when optimizing code)
svn-id: r16863
2005-02-22 18:24:24 +00:00
Paweł Kołodziejski
9d64850be2 added support for mp3 compressed tracks
svn-id: r16661
2005-01-28 11:59:08 +00:00
Max Horn
608cfc0149 Fix for bug #1098872 (FTDEMO: Memoryleak in SMUSH player)
svn-id: r16570
2005-01-16 13:34:43 +00:00
Max Horn
d541535ab6 Cosmetic change, avoiding a hypothetical threading problem, see bug #1098864
svn-id: r16569
2005-01-16 13:32:48 +00:00
Max Horn
cffd917165 system.h was being included in tons of places, without any good reason; reduced this (total dependencies on system.h went down from 193 to 85 files)
svn-id: r16527
2005-01-10 22:06:49 +00:00
Max Horn
32f0dbdcb2 Moving AppendableAudioStream into SCUMM engine, as it is only used there
svn-id: r16494
2005-01-09 03:15:59 +00:00
Max Horn
9cfb8d3bb5 Fix getStrings to use the ScummEngine::openFile method
svn-id: r16453
2005-01-06 18:38:11 +00:00
Max Horn
47280d9433 Updated copyright
svn-id: r16398
2005-01-01 16:09:25 +00:00
Max Horn
67b311713d Added 'sound types' to the mixer - for now, only plain (for the premixer), SFX and music; volume is now controlled based on the sound type
svn-id: r16330
2004-12-27 00:27:00 +00:00
Nicolas Bacca
1bd0c66715 WinCE workaround to limit issues if the decoding is too slow
svn-id: r16220
2004-12-21 00:00:34 +00:00
Max Horn
c51b1266c0 Removed the (highly SCUMM specific) 'appendable stream' API from SoundMixer; SCUMM now uses the appendable stream directly
svn-id: r15919
2004-11-27 17:09:05 +00:00
Max Horn
ba74a8e7f6 Added some more mixer doxygen docs; cleaned up Mixer API a bit, removing some very specialised methods
svn-id: r15914
2004-11-27 15:58:18 +00:00
Max Horn
b60febe8a8 Patch #1048283 (Improved CJK / FM-TOWNS support & some documention)
svn-id: r15671
2004-10-23 23:08:53 +00:00
Max Horn
0d746b05fc Added methods to access charset x/y offs values (though those seem to be all 0 in COMI)
svn-id: r15482
2004-10-09 00:47:47 +00:00
Gregory Montoir
9c863283ed fix bug #1042931. This version of comidemo doesn't have the videos. In this case, SmushPlayer::play() returns immediately without calling init(). Thus, if init() is not called, we shouldn't call release() at all.
svn-id: r15475
2004-10-08 18:30:14 +00:00
Max Horn
71264fbc56 Workaround for bug #1035739 (SMUSH: Ugly palette change when video finishes)
svn-id: r15373
2004-10-01 21:37:29 +00:00
Max Horn
61f8a035c7 Hack to work around bug #1037052
svn-id: r15349
2004-09-29 17:50:17 +00:00
Max Horn
ce8c99bf62 Rename remaining OSystem methods to match our coding guidelines
svn-id: r15332
2004-09-28 20:19:37 +00:00
Max Horn
93f86eda94 cleanup / comments
svn-id: r15309
2004-09-27 20:44:27 +00:00
Max Horn
59fb1a53cf enums are more efficient than static const ints :-)
svn-id: r15299
2004-09-26 18:08:51 +00:00
Max Horn
768133d6e6 Rename some member vars to avoid _ followed by an uppercase letter. More of those are left in the code, though (and I am not really sure whether we want to change that, so far we had no problems caused by this)
svn-id: r15175
2004-09-18 22:42:45 +00:00
Paweł Kołodziejski
bdf2a24eb7 added experimental ogg file support for comi smush audio track
svn-id: r15168
2004-09-18 18:09:35 +00:00
Travis Howell
2e3833dc1f Switch smush debug to channel
svn-id: r14676
2004-08-22 09:14:19 +00:00
Max Horn
152a5e97fe Modified VirtScreen to inherit from Graphics::Surface, and added getPixels()/getBackPixels() accessors (these changes make it a bit easier to implement smooth scrolling); also replaced some uses of rtBuffer by proper access through the corresponding VirtScreen
svn-id: r14612
2004-08-14 19:42:00 +00:00
Paweł Kołodziejski
d62ff5dca7 fixed warnings
svn-id: r14603
2004-08-14 09:10:14 +00:00
Max Horn
908723cc84 Load SMUSH files and NUT fonts from mac container files, too (done that by adding a new high level method openFile to class ScummEngine)
svn-id: r14346
2004-07-26 23:15:01 +00:00
Gregory Montoir
db4c7d22bf smush codec37 sub1 (FT demo)
svn-id: r14326
2004-07-25 19:05:16 +00:00
Max Horn
fb88830bd6 Too many newlines
svn-id: r14267
2004-07-18 22:29:22 +00:00
Max Horn
a5df4fba77 Added simple ref-counting to the File class
svn-id: r14106
2004-06-28 22:34:22 +00:00
Max Horn
df984b3824 Thanks to File::setDefaultDirectory(), in most cases it is *not* necessary to pass getGameDataPath() on to File::open()
svn-id: r14087
2004-06-27 21:52:25 +00:00
Max Horn
4b2d863924 Renamed/documented some odd smush/insane vars
svn-id: r14085
2004-06-27 21:06:04 +00:00
Paweł Kołodziejski
fdb2c41cdd increased audio buffer to solve scuttering problems
svn-id: r13993
2004-06-21 06:59:24 +00:00
Paweł Kołodziejski
8a685092d2 moved sound calls to the same smush thread with others sounds
svn-id: r13977
2004-06-20 16:38:28 +00:00
Paweł Kołodziejski
83d4d9058e trackOffset is obsolote, added few debugs, added flush sounds while smush plying to prevent overload tracks
svn-id: r13974
2004-06-20 15:28:11 +00:00
Paweł Kołodziejski
cd0c2dfdeb _allreadyInit was not initializedin smush player
svn-id: r13919
2004-06-01 20:28:20 +00:00
Travis Howell
163dc349b6 Fix insane regression.
svn-id: r13774
2004-05-04 14:56:47 +00:00
Paweł Kołodziejski
78f2d34825 remove useless mutex
svn-id: r13722
2004-05-01 18:53:03 +00:00
Paweł Kołodziejski
17332e393e added mutex into smush player
svn-id: r13639
2004-04-26 09:04:08 +00:00
Max Horn
f8d9bc6bcd Revert debug levels
svn-id: r13590
2004-04-16 21:05:09 +00:00
Max Horn
bcb7878f10 Unify some code
svn-id: r13589
2004-04-16 20:49:14 +00:00