Commit Graph

218 Commits

Author SHA1 Message Date
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
Florian Kagerer
e1a333570e SCI: set MDT_PREFER_GM instead od MDT_PREFER_MT32
svn-id: r50289
2010-06-25 20:58:52 +00:00
Florian Kagerer
c35e350531 AUDIO: get rid of MDT_PREFER_MIDI since it should be sufficient to either select MDT_PREFER_MT32 or MDT_PREFER_GM
svn-id: r50288
2010-06-25 20:51:57 +00:00
Martin Kiewitz
b188fc14a2 SCI: only send new volume to currently mapped channels, fixes assert in sq1 because setVolume is called on an object that's currently not playing. added fixme
svn-id: r50274
2010-06-25 16:43:09 +00:00
Filippos Karapetis
59c908e97d Changed a warning which seems like regular SCI behavior into a debugC
svn-id: r50218
2010-06-24 13:44:27 +00:00
Filippos Karapetis
0a102981f0 Moved the SelectorCache struct inside selector.h, where it belongs, and fixed some header dependencies in the process
svn-id: r50183
2010-06-23 15:23:37 +00:00
Martin Kiewitz
3c4bfa6cac SCI: removing unneeded capacity uint from r50143
svn-id: r50147
2010-06-22 15:45:59 +00:00
Matthew Hoops
bb9f556c36 Add support for the QFG3 demo audio map and audio resources. Based on a patch by Walter.
svn-id: r50144
2010-06-22 15:18:55 +00:00
Martin Kiewitz
a82ca9de5c SCI: change midi queue to Common::Array and make it resize itself if needed instead of error()
svn-id: r50143
2010-06-22 15:05:09 +00:00
Martin Kiewitz
b5dffc5aa3 SCI: fades already send out commands directly
svn-id: r50131
2010-06-21 22:15:33 +00:00
Martin Kiewitz
1041067a0c SCI: instead of queueing inside midiparser, we are queueing now globally in SciMusic, also some little cleanup
svn-id: r50130
2010-06-21 22:07:03 +00:00
Max Horn
bbad3f333a Patch #1956501: "GUI/LAUNCHER: Midi device selection"
svn-id: r50128
2010-06-21 21:36:36 +00:00
Martin Kiewitz
4a4fcb19dd SCI: added fixme about r50110/r50073
svn-id: r50115
2010-06-21 15:05:48 +00:00
Martin Kiewitz
cfcf53bec0 SCI: fix regression of r50073, allNotesOff() now directly sends to driver again. If we send to queue, queue will never actually get processed and even if it was, the channels wouldnt be mapped anymore anyway
svn-id: r50110
2010-06-21 10:51:14 +00:00
Martin Kiewitz
81f64c9e3e SCI: storing all manual midi commands now and actually sending them to driver during onTimer() - fixes mt32 emulation crashing during lsl5 piano scene
svn-id: r50073
2010-06-20 10:25:46 +00:00
Martin Kiewitz
b0a36849da SCI: locking _mutex inside SciMusic::sendMidiCommand(MusicEntry *pSnd, uint32 cmd)
svn-id: r50065
2010-06-19 21:15:58 +00:00
Martin Kiewitz
ef67a37b54 SCI: fixing last uninitialized variable issue in MidiParser_SCI (hopefully)
svn-id: r50063
2010-06-19 20:37:53 +00:00
Martin Kiewitz
f3b8a5927d SCI: fixing another uninitialized variable usage issue - also limiting reset velocity to used channels only, same is true for setting voice count
svn-id: r50062
2010-06-19 20:23:55 +00:00
Martin Kiewitz
089f5bba14 SCI: stopping scripts from sending to unused channels manually (fixes sq1vga)
svn-id: r50060
2010-06-19 20:00:32 +00:00
Martin Kiewitz
24459b5842 SCI: reverting r50058 - we can't actually send to the channels at that time, because we do not own the channels at that point
svn-id: r50059
2010-06-19 19:47:22 +00:00
Martin Kiewitz
a845e8b859 SCI: move setVolume down inside loadMusic so that it actually affects the used channels
svn-id: r50058
2010-06-19 19:39:36 +00:00
Martin Kiewitz
447f127013 SCI: fixing uninitialized usage in MidiParser_SCI
svn-id: r50057
2010-06-19 19:16:42 +00:00
Martin Kiewitz
ed50ecd62d SCI: make channel remapping stop using channel 0 for mt32 - fixes playback accordingly (like lsl1 at the start)
svn-id: r50056
2010-06-19 19:06:58 +00:00
Martin Kiewitz
ab4e02422c SCI: free channels for channel remapping on stop and pause, instead of dispose - fixes qfg3 demo going out of channels
svn-id: r50054
2010-06-19 17:43:13 +00:00
Walter van Niftrik
f4b700c4c4 SCI: AdLib: add dummy instruments when there are only 48 in the patch
svn-id: r50035
2010-06-19 01:16:25 +00:00
Filippos Karapetis
5d378574a4 Fixed show_instruments to ignore instruments in Sierra's special MIDI channel 15, and updated the comment regarding PQ2 accordingly (it only has 2 incorrect instruments)
svn-id: r50021
2010-06-18 15:18:14 +00:00