68 Commits

Author SHA1 Message Date
Max Horn
4b6dae31eb changed loadVOCFile to work on a generic ReadStream instead of a File, and renamed it to loadVOCFromStream; removed readVOCFromMemory as it isn't used anymore, and in the future, a MemoryReadstream plus loadVOCFromStream can achieve the same effect
svn-id: r14383
2004-07-31 11:46:58 +00:00
Travis Howell
c6b037b9ed Reduce simon 1/2 targets
Add auto detection

svn-id: r14361
2004-07-30 09:00:29 +00:00
Max Horn
b8ad54b3af Reversed param order of File::open() -- this allowed me to get rid of a few more getGameDataPath() calls
svn-id: r14090
2004-06-27 22:14:35 +00:00
Max Horn
aa6ec62e9d Patch #885904 (Flac Support) with some tweaks by me
svn-id: r12984
2004-02-22 14:11:16 +00:00
Oliver Kiehl
a9f8a9ca18 oops
svn-id: r12511
2004-01-19 17:50:38 +00:00
Oliver Kiehl
7080232de0 fix memory leak
svn-id: r12510
2004-01-19 17:46:08 +00:00
Oliver Kiehl
18799981aa fix mp3 and vorbis specific bug in which sound files could have been read
as zero-byte files in the case that two following offsets pointed to the
same file.

svn-id: r12509
2004-01-19 17:44:04 +00:00
Oliver Kiehl
563d95c576 fix silly bug
svn-id: r12319
2004-01-11 15:42:11 +00:00
Max Horn
033ff78ae9 updated copyright notice
svn-id: r12176
2004-01-06 12:45:34 +00:00
Max Horn
b1d729d6dd renamed SimonSound class back to just Sound (now that we use namespaces that is just fine)
svn-id: r12098
2004-01-03 01:28:00 +00:00
Max Horn
436b5c5f7d Use VOC reader from voc.h
svn-id: r11963
2003-12-27 14:11:03 +00:00
Max Horn
e9269257f3 turned PlayingSoundHandle into an 'opaque' (well not really :-) data type, mainly because people kept (accidentally and sometimes on purpose :-) misusing them
svn-id: r11881
2003-12-24 00:25:18 +00:00
Max Horn
5eef5d4e15 add purely experimental & untested Ogg Vorbis support to Simon
svn-id: r11816
2003-12-21 16:01:36 +00:00
Max Horn
dafca64f36 don't use sound/mixer index, rather use the sound handle!
svn-id: r11794
2003-12-21 00:05:00 +00:00
Travis Howell
73f3c3bdd4 Remove warning.
svn-id: r11609
2003-12-13 01:54:53 +00:00
Travis Howell
3d04b69cbd Don't switch voice file in simon2mac unless needed.
svn-id: r11608
2003-12-13 01:54:17 +00:00
Max Horn
242efda7fb cleanup
svn-id: r11439
2003-12-01 00:45:16 +00:00
Max Horn
d98479ee5d cleanup; fix some memory leaks; more memory leaks remaining
svn-id: r11419
2003-11-29 11:56:24 +00:00
Paweł Kołodziejski
7d6c5bc1da cleanup whitespaces
svn-id: r11214
2003-11-08 20:54:31 +00:00
Travis Howell
3ccd6704bd Don't attempt to play sound in simon2mac if file doesn't exist.
Add fixme for simon2mac, freeing voice at this point which causes crashes.

svn-id: r10943
2003-10-23 04:49:04 +00:00
Max Horn
5301edc383 some cleanup
svn-id: r10720
2003-10-10 13:55:08 +00:00
Max Horn
a4b72c9d6e Simon namespace
svn-id: r10574
2003-10-03 19:42:27 +00:00
Travis Howell
3854ce8f3d Add Acorn version of Simon the Sorcerer 1 Talkie
svn-id: r10389
2003-09-24 06:19:30 +00:00
Max Horn
07a9646997 moved declaration of error/warning/debug from engine.h to util.h
svn-id: r10152
2003-09-10 12:31:20 +00:00
Max Horn
7342163c7e make use of voc.h; some cleanup
svn-id: r10073
2003-09-07 20:30:02 +00:00
Max Horn
0be0196013 removed pauseMixer method from mixer, and renamed stop to stopChannel
svn-id: r10042
2003-09-06 10:47:30 +00:00
Max Horn
06b6ff9a44 added default volume/pan values
svn-id: r10019
2003-09-05 21:06:32 +00:00
Paweł Kołodziejski
7bc63a0ce3 fixes for uninitialized pan and volume
svn-id: r9998
2003-09-05 06:22:10 +00:00
Paweł Kołodziejski
5a6bce590b changed sounds volume to original volume level, and fixed sounds in bass intro
svn-id: r9963
2003-09-02 07:49:40 +00:00
Paweł Kołodziejski
2533b23a60 added mixer features: volume and pan control per channel
svn-id: r9944
2003-08-31 20:26:21 +00:00
Torbjörn Andersson
dfe5d067bb Reverted previous change since the mixer change was reverted.
svn-id: r9929
2003-08-30 20:35:07 +00:00
Torbjörn Andersson
e7bebcf7aa Fixed Simon 2 intro regression (and possibly others as well) caused by
recent mixer change.

svn-id: r9926
2003-08-30 20:14:30 +00:00
Max Horn
6b470390f7 cleanup
svn-id: r9281
2003-07-29 12:39:41 +00:00
Travis Howell
8146de7693 ambient sfx works fine again
svn-id: r9178
2003-07-24 17:49:03 +00:00
Travis Howell
be7597a8c9 Should be right now
svn-id: r9174
2003-07-24 16:54:40 +00:00
Travis Howell
635fea9b17 Simon games shold only play one voice at a time.
Fixes many voice overlaps
Fixes subtitles been ot of sync with voice, with simon 1 versions that had combi
ned speech/subtitles.

svn-id: r9167
2003-07-24 14:21:56 +00:00
Travis Howell
55c71f65c0 Another leak
svn-id: r9165
2003-07-24 12:32:56 +00:00
Travis Howell
f930abe568 Check before releasing memory
svn-id: r9163
2003-07-24 12:05:06 +00:00
Travis Howell
da0db02f6e Fix for simon2mac voices problem, bug #776803
svn-id: r9160
2003-07-24 10:20:56 +00:00
Travis Howell
2b5cc772d7 Add sfx/voice support for simon1cd32, thanks to olki.
Adjust a few debugs
Add hack to allow load/save in simon1cd32 via keyboard

svn-id: r9105
2003-07-21 04:00:04 +00:00
Max Horn
6ca8d634fd only declare class MP3Sound if USE_MAD is #defined
svn-id: r8644
2003-06-24 21:52:52 +00:00
Max Horn
7281ac6907 undo this change again - proper fix would be to correct the MP3 playback code
svn-id: r8593
2003-06-21 22:04:20 +00:00
Max Horn
3de24123e7 fix some memory leaks
svn-id: r8580
2003-06-21 15:36:19 +00:00
Max Horn
ece6f28fd7 fix (?) for an invalid read report in valgrin
svn-id: r8578
2003-06-21 15:32:25 +00:00
Max Horn
0832c1f662 reuse file, remove file2 usage
svn-id: r8573
2003-06-20 12:25:37 +00:00
Max Horn
9ef0657c5c renamed Sound -> BaseSound to avoid conflicts with the scumm class of the same name (we really should start to put all the Scumm/Simon/Sky code into namespaces
svn-id: r8508
2003-06-15 12:22:19 +00:00
Max Horn
0d85cd1ee6 small reorg (keep private classes out of header files, if possible -> decreases compile times a bit); fixed a small memory leak for Simon2mac; don't delete _file twice in Sound subclasses
svn-id: r8506
2003-06-15 11:48:04 +00:00
Travis Howell
8446d7d67e Stop simon1win crashing on loading of save game
svn-id: r8504
2003-06-15 10:48:21 +00:00
Oliver Kiehl
ce51902d7a fix for simon2
svn-id: r8503
2003-06-15 10:30:08 +00:00
Oliver Kiehl
4d5db88535 cleanup
svn-id: r8502
2003-06-15 09:55:10 +00:00