Matthew Hoops
7a86204e5c
SOUND: Move the Mac snd decoder from SCI to /sound
...
For use with Kyra1 Mac instrument samples. T7G Mac and Loom Mac also use this format for their custom instrument samples.
svn-id: r51327
2010-07-26 18:13:35 +00:00
Filippos Karapetis
1f60595cdc
SCI: Cleanup leftovers from the FreeSCI sound code
...
svn-id: r51178
2010-07-22 22:13:28 +00:00
Martin Kiewitz
f771a2bbc7
SCI: fix regression of r50463
...
also check delta, because _play_tick does not include delta at that point - fixing sq1 ship takeoff
svn-id: r51067
2010-07-20 17:28:10 +00:00
Martin Kiewitz
a24de29358
SCI: renaming kDoSound(resume) to resumeAfterRestore
...
kDoSound(resumeAfterRestore) is called right after restoring a saved game for sound-sci0 games, we already resume playing music inside restore, so we don't need to implement this at all
svn-id: r51058
2010-07-20 11:17:33 +00:00
Martin Kiewitz
961079ae19
SCI: disabling kDoSound(StopAll)
...
this call can't be right, gets called in kq1 several times and would stop background effects
svn-id: r51039
2010-07-19 22:11:06 +00:00
Martin Kiewitz
9cb23c8a7b
SCI: update sample ticker when paused
...
little adjustment of r51017
svn-id: r51018
2010-07-19 07:37:22 +00:00
Martin Kiewitz
d952e48a57
SCI: change kDoSound(updateCues) for samples
...
only set signal when sample was/is playing, fixes qfg2 genie intro
svn-id: r51017
2010-07-19 07:29:17 +00:00
Matthew Hoops
0e9de72f62
SCI: Rename the Amiga music drivers to AmigaMac to reflect its current purpose.
...
svn-id: r51006
2010-07-18 19:01:35 +00:00
Matthew Hoops
d14635d6b2
SCI: Oops, silence gcc warning.
...
svn-id: r51002
2010-07-18 18:18:11 +00:00
Matthew Hoops
6eedb73dba
SCI: Add initial support for SCI0 Mac and SCI1 Amiga/Mac sound.
...
SCI1 sound is pretty much done, but envelope support is still not 100% complete. SCI0 Mac sound is not complete, but sounds "ok" for now.
Much thanks to Walter, who did a ton of work on this.
svn-id: r51001
2010-07-18 18:14:56 +00:00
Martin Kiewitz
3189fe4a32
SCI: change to r50995 - better stop fading when stop is called
...
svn-id: r50996
2010-07-18 16:25:23 +00:00
Martin Kiewitz
aa5a1ddb47
SCI: if game starts fading, stops music and later starts music again don't resume fading - fixes lsl6 music when going in from swimming pool
...
svn-id: r50995
2010-07-18 16:22:16 +00:00
Martin Kiewitz
46b27926b2
SCI: adding obj in kDoSound debug output
...
svn-id: r50994
2010-07-18 16:02:16 +00:00
Johannes Schickel
83e2aa2360
Remove extra ";" in class declarations.
...
svn-id: r50955
2010-07-17 00:05:27 +00:00
Martin Kiewitz
3ceb02f08a
SCI: adding signatures for 4-parameter variant of kDoSound(sendMidi), needs to get figured out how this works - fixes signature mismatch in lsl1
...
svn-id: r50937
2010-07-16 13:37:19 +00:00
Martin Kiewitz
539d10ea11
SCI: adding sound version 2.1, to properly add sci2.1 signature for kDoSound(play)
...
svn-id: r50878
2010-07-14 11:29:55 +00:00
Martin Kiewitz
19d4374cbd
SCI: erroring out on unsupported soundversion in midiparser
...
svn-id: r50849
2010-07-13 18:15:19 +00:00
Martin Kiewitz
38d79f60e3
SCI: changing signature for kDoSound(resume) it seems its called right after restoring to resume music - which we do already automatically
...
svn-id: r50800
2010-07-11 11:52:17 +00:00
Martin Kiewitz
ce6a73adf5
SCI: updated debug output from kDoSound
...
svn-id: r50781
2010-07-10 13:19:20 +00:00
Martin Kiewitz
3fe205ba7f
SCI: fixing regression of r50414 - we set volume to standard levels inside initCommands since then, so if we set the actual needed volume before calling that it will get ignored - fixes lsl1demo
...
svn-id: r50766
2010-07-09 18:35:46 +00:00
Martin Kiewitz
18d1ab8c70
SCI: move comments and change selector for sci0 sound in kDoSoundPause, also allow pausing everything even for sci1early (qfg2 is using it)
...
svn-id: r50765
2010-07-09 18:11:42 +00:00
Martin Kiewitz
eddd6d0dba
SCI: actually all sound-sci0 games used a completely different kDoSoundPause logic, implement it - fixes all sorts of games not pausing when going to restore menu and more
...
svn-id: r50760
2010-07-09 16:05:47 +00:00
Martin Kiewitz
aadf2e9765
SCI: added currently commented-out pauseSound implementation for some sci0 games, allowing integer for that subfunction
...
svn-id: r50759
2010-07-09 14:11:27 +00:00
Martin Kiewitz
b8933d7e8f
SCI: removing unneeded mutex locking inside sci0 update cues
...
svn-id: r50758
2010-07-09 13:01:48 +00:00
Martin Kiewitz
b602e7071b
SCI: fixing regression of r50755 - fixing kDoSoundSendMidi
...
svn-id: r50757
2010-07-09 12:30:34 +00:00
Martin Kiewitz
ba776fb293
SCI: implemented subsignatures for kDoSound
...
svn-id: r50755
2010-07-09 12:06:41 +00:00
Filippos Karapetis
a1dc56429c
SCI: Removed duplicate warning for missing audio samples
...
svn-id: r50560
2010-07-01 17:42:39 +00:00
Filippos Karapetis
bff3e89e48
SCI: Removed the FreeSCI music code
...
svn-id: r50532
2010-06-30 13:49:05 +00:00
Max Horn
b09996cb5c
SCI: Rewrap yet more comments
...
svn-id: r50505
2010-06-29 20:50:52 +00:00
Martin Kiewitz
15f9f37d4d
SCI: removing ignoring of channel volume change code from r50463, the lsl5 issue was actually caused by the old volume adjust code that was also causing the issues in gk1
...
svn-id: r50466
2010-06-28 22:26:28 +00:00
Martin Kiewitz
668d820afd
SCI: its lsl5 sound resource 294, not 274 (changed comment only)
...
svn-id: r50465
2010-06-28 22:14:03 +00:00
Martin Kiewitz
805374ff4e
SCI: ignoring set signal on tick 0 directly in parseNextEvent instead of filtering, also now ignoring channel volume changes on tick 0 (fixes lsl5 fading of sound 274, almost at the end), fixing also fading in gk1 and enabling fading in sci32 again
...
svn-id: r50463
2010-06-28 22:06:19 +00:00
Martin Kiewitz
d8e4160f34
SCI: remove clipping of volume inside SciMidiParser::setvolume
...
svn-id: r50456
2010-06-28 20:17:43 +00:00
Martin Kiewitz
22a8b2236e
SCI: set volume all the time, fixes volume being 0 after fading in sci0
...
svn-id: r50418
2010-06-28 10:48:09 +00:00
Martin Kiewitz
caa4479bdf
SCI: changed the way setVolume works for sci0 back to the way it was from r50414, because adlib driver doesn't support channel volume changes for sci0 games, fixes fading in those games
...
svn-id: r50417
2010-06-28 10:36:10 +00:00
Martin Kiewitz
92cc16e6a5
SCI: reordering and cleanup, removing debug code from sci0 mix-code
...
svn-id: r50415
2010-06-28 10:00:12 +00:00
Martin Kiewitz
e4cb2703ca
SCI: implementing real setVolume() support, fixing some fading in sci1 games (like pq3 intro)
...
svn-id: r50414
2010-06-28 09:22:57 +00:00
Martin Kiewitz
253036ec4d
SCI: regression from implementing channel remapping and r50405 - center pitch wheels and hold pedal on init instead of unloadMusic(), fixes lsl5 piano scene
...
svn-id: r50413
2010-06-28 08:25:45 +00:00
Martin Kiewitz
698f10611c
SCI: fix regression of r50405 - sq1vga right at the beginning - scripts are pausing sound and then sending manually commands afterwards
...
svn-id: r50411
2010-06-28 08:16:20 +00:00
Martin Kiewitz
a887d4898d
SCI: tell midiparser that he lost ownership of channels in case we take them away
...
svn-id: r50405
2010-06-27 21:41:30 +00:00
Filippos Karapetis
1faebccce2
Cleanup, remove unused/obsolete code
...
svn-id: r50403
2010-06-27 21:29:35 +00:00
Martin Kiewitz
456265f8fa
SCI: resetting curPos as well when mixing sound resources
...
svn-id: r50401
2010-06-27 21:12:38 +00:00
Martin Kiewitz
777794d11d
SCI: filter out set signal commands from midi streams, if they happen at ticker 0. fixes castle daventry getting removed immediately in kq5 french/mac
...
svn-id: r50385
2010-06-27 17:58:26 +00:00
Martin Kiewitz
1ca0cdc8b1
SCI: fix warning
...
svn-id: r50341
2010-06-26 20:47:28 +00:00
Martin Kiewitz
710fc6c71e
SCI: do boundary checking when loading sci1 sounds and mixing them together. The final end credits song (resource 699) in kq5 has some channels with invalid offsets, crashing ScummVM before
...
svn-id: r50339
2010-06-26 19:55:49 +00:00
Martin Kiewitz
e4153044d4
SCI: reverting r50315 - had the deadlock just again...
...
svn-id: r50316
2010-06-26 11:48:42 +00:00
Martin Kiewitz
be75870100
SCI: fixing deadlock possiblity on samples (sq3 deadlocked on door opening/where am i on me)
...
svn-id: r50315
2010-06-26 11:43:14 +00:00
Martin Kiewitz
18d9f917a0
SCI: set _driver to 0 in MidiParser_SCI destructor to stop the MidiParser destructor call allNotesOff() which would affect all channels all the time - fixes sq1 ship flying away sound getting stopped when ladder falls down
...
svn-id: r50313
2010-06-26 11:16:25 +00:00
Martin Kiewitz
906b3221f5
SCI: removing fixme (issue got already solved)
...
svn-id: r50311
2010-06-26 10:51:38 +00:00
Martin Kiewitz
16f854ba64
SCI: dont call midiparser->stop() if paused sound gets stopped
...
svn-id: r50310
2010-06-26 10:47:38 +00:00