Commit Graph

86 Commits

Author SHA1 Message Date
Travis Howell
01b2f38670 HE games queue speech as sound resource 1.
svn-id: r17965
2005-05-08 14:31:27 +00:00
Travis Howell
9380304832 Read index of music file in HE games at startup.
Only reliable way to always get correct music tracks.

svn-id: r17798
2005-04-25 05:44:12 +00:00
Travis Howell
d4ba67a497 Use correct music offsets for HE games, only a few demos use wrong tunes now.
Get all music details for HE games from one function only.

svn-id: r17662
2005-04-18 07:18:33 +00:00
Travis Howell
f230fe65e8 Add 8 sound channel support for HE games
-Allows sound looping to work

Added support for WAVE format musuc used in later HE100 games.

svn-id: r17372
2005-04-04 11:43:25 +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
Travis Howell
bebad400d6 Check sound queue for music in HE games.
Avoid extra sound channel.

svn-id: r16706
2005-01-30 11:03:49 +00:00
Travis Howell
63ebdfa6c7 Correct sound offset size
svn-id: r16628
2005-01-24 10:07:17 +00:00
Travis Howell
b9356bbe14 Check for negative sound offset.
svn-id: r16602
2005-01-20 12:56:27 +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
47280d9433 Updated copyright
svn-id: r16398
2005-01-01 16:09:25 +00:00
Max Horn
bc3b3517b2 Merge startSfxSound into startTalkSound
svn-id: r16338
2004-12-27 16:24:49 +00:00
Travis Howell
9005514601 Add initual sound looping support for HE 70+ games.
svn-id: r15538
2004-10-13 07:52:42 +00:00
Travis Howell
0c5db81d0d Add extra sound check for HE games
svn-id: r14860
2004-09-02 04:23:13 +00:00
Travis Howell
d63d23ed07 Add patch #999887 - Possible fix for bug #998276
Also saves _currentMusic

svn-id: r14525
2004-08-09 01:07:48 +00:00
Travis Howell
dc476abe60 Fix bug #780922 - SAM: Conroy doesn't stop singing when escaping cutscene
svn-id: r14524
2004-08-09 00:58:21 +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
Travis Howell
ce620d17fd Remove lefts overs of old hack
svn-id: r14320
2004-07-24 14:24:34 +00:00
Travis Howell
370cf65966 Corrtection from disasm., mouth sync uses speech timing.
Fix bug #

svn-id: r14319
2004-07-24 13:36:26 +00:00
Travis Howell
d68d9a4e1d Add support for sound offsets in HE games.
svn-id: r14209
2004-07-14 07:29:09 +00:00
Travis Howell
621ff05ace Add support for music in HE 7.0 games.
Check music status correctly in 3DO versions.

svn-id: r14193
2004-07-12 09:02:18 +00:00
Travis Howell
7989a98952 Add FBEAR: Partial fix for the piano, patch #977249
svn-id: r13999
2004-06-22 10:39:46 +00:00
Chris Apers
5af7979f0b Fixed illegal access to protected/private member on PalmOS (??)
svn-id: r13588
2004-04-16 12:47:55 +00:00
Max Horn
3b7af85adf Cleanup Sound constructor; change search order of SFX files
svn-id: r13527
2004-04-10 00:07:58 +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
Max Horn
ebecf1dbaa unify _vm / _scumm usage
svn-id: r12262
2004-01-08 20:37:26 +00:00
Max Horn
033ff78ae9 updated copyright notice
svn-id: r12176
2004-01-06 12:45:34 +00:00
Max Horn
aa26fa0681 when introducing a constant used throughout multiple files, best assign a *name* to it, else you're digging your own grave on the long run :-)
svn-id: r11941
2003-12-26 13:13:56 +00:00
Max Horn
509ce7c4db cleanup; fix File::open usage (do not hardocde constant values, rather use the symbolic namescvs diff | bbeditcvs diff | bbedit
svn-id: r11911
2003-12-25 15:09:23 +00:00
Max Horn
3f77642948 Replace the DOTT/SAM hack (which ensures that only one SFX is being played at a time for them) with proper code: instead of hacking the sound handle, we assign a fake sound ID to the SFX, thus ensuring only one is playing at a time
svn-id: r11880
2003-12-23 19:18:20 +00:00
Max Horn
4abee14310 cleanup
svn-id: r11865
2003-12-23 00:17:29 +00:00
Max Horn
1e5496b2c8 Moved bundle music code from class Sound to IMuseDigital (seems more natural; and allows for various cleanup)
svn-id: r11846
2003-12-22 08:22:04 +00:00
Max Horn
f00cd05b33 moved Audio CD (emulation) code from scumm/sound.cpp to sound/, so that it may be reused by other engines in the future
svn-id: r11421
2003-11-29 12:11:01 +00:00
Paweł Kołodziejski
97c78cc376 changed getting position of bundle song to ms
svn-id: r11265
2003-11-12 07:05:52 +00:00
Max Horn
0bcc7ce80e made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup
svn-id: r11257
2003-11-11 00:40:35 +00:00
Max Horn
4ae61964f2 cleanup
svn-id: r10874
2003-10-17 17:05:19 +00:00
Max Horn
96a8d0ec1c proper fix for COMI timer issue: don't let a Timer remove itself
svn-id: r10867
2003-10-17 16:30:24 +00:00
Max Horn
d7660a2662 introduced namespace Scumm; made #include statements use scumm/ prefix explicitly
svn-id: r10571
2003-10-03 18:33:57 +00:00
Max Horn
3f55f2669d renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace)
svn-id: r10549
2003-10-02 22:42:03 +00:00
Max Horn
8f26c43b49 cleanup
svn-id: r10260
2003-09-15 19:48:54 +00:00
Max Horn
a7676e07c3 removed the seperate 'MP3' CD methods in class Sound (besides being misnamed, merging them into their parent functions actually seems clearer to me, reading wise)
svn-id: r10071
2003-09-07 19:47:58 +00:00
Max Horn
1dbab0237f cleanup/refactoring
svn-id: r10070
2003-09-07 19:28:45 +00:00
Max Horn
361c3b95d5 some cleanup; clarified isSoundInUse semantics and the difference between IMuse::get_sound_active and IMuse::getSoundStatus; added lots of const qualifiers to IMuse; rewrote IMuseInternal::getSoundStatus (hopefully not breaking it); added MusicEngine::getSoundStatus
svn-id: r10069
2003-09-07 17:14:56 +00:00
Paweł Kołodziejski
743a3fbdaf added sound handle stuff to mixer streams
svn-id: r9956
2003-09-01 13:43:22 +00:00
Max Horn
0df319e952 #include cleanup (explicityl specify the location for headers from common/, so that we at some point can get rid of -Icommon; exception is made for stdafx.h, since a) we might want to rename it and b) might want to move it to the top level)
svn-id: r9359
2003-08-01 12:21:04 +00:00
Max Horn
0b4e48b59e revamped MP3/Vorbis CD 'emulation' code to use a PlayingSoundHandle -> this allows to finally get rid of the hackish isChannelActive/isChannelUsed methods in SoundMixer
svn-id: r9346
2003-07-31 20:24:10 +00:00
Max Horn
6b470390f7 cleanup
svn-id: r9281
2003-07-29 12:39:41 +00:00
Max Horn
9bd7cdbce0 so it's not the endFrame, but the duration (in frames), after all! grmbl, took me long enough to figure this out, now I can fix up system.h, and then decide whom I can blame for this mess (yeah I know I renamed everything to endFrame in here, but it was named incorrectly in many other places already... ah well, at least now we know :-)
svn-id: r9130
2003-07-22 20:27:54 +00:00
Max Horn
bb87787314 fix for bug #769744 (COMI: Trying to append to a nonexistant stream)
svn-id: r9025
2003-07-14 21:37:45 +00:00
Max Horn
095b68d74f partially implemented the Audio CD query opcode in Zak256 (see bug #762589); cleanup
svn-id: r8680
2003-06-30 23:18:20 +00:00
Max Horn
67a1aa89db Fixes as per bug #762593 (Zak256 Audio CD handling); some cleanup (e.g. renamed start/delay -> startFrame/endFrame)
svn-id: r8679
2003-06-30 22:25:08 +00:00