Commit graph

93 commits

Author SHA1 Message Date
Jamieson Christian
ba0abd27d7 Fixed GM instrument dropouts on load
svn-id: r5868
2002-12-07 17:10:18 +00:00
Jamieson Christian
50b69cb2db Fixed inappropriate expiration of sound resources,
which fixes concurrency issues esp. in PocketPC and MorphOS.
Stubbed SysEx command 2 (start of song) to get rid of annoying warning.
Changed MT-32 instrument warnings to fit on one (80-char) line.

svn-id: r5842
2002-12-05 21:45:55 +00:00
Max Horn
9fb83e313a fixed a race condition during startup of ScummVM
svn-id: r5822
2002-12-03 17:54:25 +00:00
Jamieson Christian
791d92495e Removed commented-out vestiges of IMuseAdlib
svn-id: r5794
2002-12-01 20:16:54 +00:00
Jamieson Christian
cc6c37e1ad Fixed Adlib instrument setup in old (GF_SMALL_HEADER) games.
Restored MT-32 emulation lost during restructuring.

svn-id: r5786
2002-12-01 15:51:29 +00:00
Jamieson Christian
973164a741 Restructured MIDI channel allocation architecture.
Adlib no longer suffers from 16-channel MIDI restrictions.
Fixes a regression in the MI2 intro music under Adlib.

svn-id: r5721
2002-11-26 16:54:58 +00:00
Jamieson Christian
d2b94bd0e0 Fixed invalid ImSetTrigger invocations, which fixes invalid do_command(0) calls.
Also included is eriktorbjorn's fix for Adlib instrument setup.

svn-id: r5701
2002-11-23 16:15:33 +00:00
Jamieson Christian
a222ed17de Fixed Adlib instruments not getting initialized in certain cases.
svn-id: r5688
2002-11-21 22:07:40 +00:00
Jamieson Christian
c9ed09e7df Revamped Adlib functionality.
IMuseAdlib is defunct.
New MidiDriver_ADLIB device.
Simon 1/2 now supports Adlib.

svn-id: r5677
2002-11-21 19:06:42 +00:00
Max Horn
f2007606a9 fixed warning
svn-id: r5599
2002-11-18 20:05:25 +00:00
Jamieson Christian
5da9c10dab Fixes to Master/SFX/Music volumes:
- All are in 0-255 range now. No 0-127 mismatches.
- Master volume now affects SFX and Music, consistent with LEC behavior.
- The [ and ] keys now affect Music volume, not Master. Consistent with LEC behavior.
Also changed [ and ] increment to 16, for 256/16 = 16 volume increments outside the GUI.

svn-id: r5592
2002-11-17 17:59:00 +00:00
Jamieson Christian
c1344ee379 [Bug 590646] Fixed problem with small blips of music playing
when master/music volumes are changed in the ScummVM GUI.

svn-id: r5581
2002-11-16 14:23:22 +00:00
James Brown
f2f9f48faf Music tempo patch
svn-id: r5556
2002-11-15 10:36:50 +00:00
Jamieson Christian
788a1bddec Patch 637825, plus stubs for remaining MT32 instruments to reconcile
svn-id: r5542
2002-11-14 02:26:40 +00:00
Max Horn
c5847f6f3b more initialisation fixes
svn-id: r5532
2002-11-13 14:54:58 +00:00
Jamieson Christian
bf1efccac0 Fixed race condition check in midi_driver_thread.
Updated do_command for Conroy Bumpus' song.

svn-id: r5510
2002-11-10 18:34:57 +00:00
Max Horn
c772fff655 fixed stupid mistake
svn-id: r5494
2002-11-10 15:09:13 +00:00
Max Horn
54aa3f898d fixed two race conditions
svn-id: r5490
2002-11-10 14:49:49 +00:00
Jamieson Christian
a1954ac31e Fixed IMuseGM device state trackers to prevent inappropriate dropped messages.
svn-id: r5487
2002-11-10 13:44:53 +00:00
Jamieson Christian
4fd2497a21 New IMuseMonitor front-end provides thread-safe access into IMuse from scripts and the MIDI parser. This seems to effectively remove pointer corruption observed under IMuseGM, and also provides thread-safe access into IMuseAdlib.
This is an improved version of the mutex-based solution presented in Patch 615737.

svn-id: r5474
2002-11-09 16:55:16 +00:00
Jamieson Christian
6fe39f5ba8 Initial upgrades to support MT-32 emulation
svn-id: r5449
2002-11-06 21:34:38 +00:00
Jamieson Christian
c10287988e Increased GM channel resource to full spectrum (0-15, instead of 0-8 Base MIDI config); misc. pitchbend cleanups
svn-id: r5403
2002-11-04 18:29:26 +00:00
Paweł Kołodziejski
bf3505da5c don't put samples into stream SoundMixer if sound card is disabled
svn-id: r5338
2002-10-27 19:32:36 +00:00
Paweł Kołodziejski
99ec620c58 changing warnings to debug level 2
svn-id: r5273
2002-10-23 06:48:10 +00:00
Max Horn
ab13e67b09 fix -Wshadow warnings
svn-id: r5270
2002-10-23 00:24:43 +00:00
Nicolas Bacca
b68ce40214 Please my picky compiler
svn-id: r5262
2002-10-22 23:20:37 +00:00
Max Horn
5151e561d5 fixing various warnings that occur with -Wshadow;some other minor cleanup
svn-id: r5239
2002-10-22 11:48:24 +00:00
Max Horn
d4558a5d3b oops forgot this file
svn-id: r5213
2002-10-21 12:47:06 +00:00
Jamieson Christian
7677e42ffe Pitch bend fixes for QTMA
svn-id: r5208
2002-10-21 09:32:38 +00:00
Jamieson Christian
5862695bfd Patch #607175 correction to fix regression Bug #622606
svn-id: r5207
2002-10-21 08:17:18 +00:00
Jamieson Christian
67c00eb7e6 Changed IMuse from a proxy into a virtual base class
svn-id: r5205
2002-10-21 07:31:51 +00:00
Paweł Kołodziejski
41b61adac0 fixes to imuse
svn-id: r5161
2002-10-16 07:59:11 +00:00
Paweł Kołodziejski
09225027f1 changes to imuse
svn-id: r5157
2002-10-15 21:55:04 +00:00
Paweł Kołodziejski
45b1a8ea45 cleanup sfx and music in imuse, changed talkdelay description(disable) in the dig
svn-id: r5148
2002-10-15 06:53:42 +00:00
Jamieson Christian
3fb3f65a18 Various Sam & Max iMuse upgrades
svn-id: r5147
2002-10-14 16:42:57 +00:00
James Brown
b19694bb04 Fix oversight - GID_'s are stored as a constant assigned to Scumm::_gameId, NOT as a bit of Scumm::_features :)
svn-id: r5139
2002-10-13 14:21:57 +00:00
Jamieson Christian
2255b212ed Fixed GM part allocation conflicts, default Sam & Max pitch bend range
svn-id: r5136
2002-10-13 08:15:15 +00:00
James Brown
be120d3a34 Patch 614005(b) - Pitchblend updates
svn-id: r5135
2002-10-13 06:07:39 +00:00
James Brown
69c7a8b572 Patch 622386: do_command(256) implementation, Sam and Max
svn-id: r5134
2002-10-13 05:39:26 +00:00
Jamieson Christian
127901828d Revised do_command(15) to finalize cleanup of Sam & Max opening cutscene/credits
svn-id: r5132
2002-10-12 14:43:00 +00:00
James Brown
cf805918b4 Patch something: imTrigger implementation
svn-id: r5131
2002-10-12 04:57:49 +00:00
Paweł Kołodziejski
4cf42ae9a8 added FT imuse music
svn-id: r5127
2002-10-11 08:35:12 +00:00
Paweł Kołodziejski
fec2879a07 update imuse tables
svn-id: r5126
2002-10-10 21:38:20 +00:00
Paweł Kołodziejski
3513779186 added the dig imuse seq music
svn-id: r5125
2002-10-10 19:14:28 +00:00
James Brown
443e88d2a4 Fix compilation
svn-id: r5122
2002-10-10 15:20:38 +00:00
James Brown
095b041ccd Update some comments
svn-id: r5121
2002-10-10 15:16:58 +00:00
James Brown
cb03a14bb4 Patch 620944 Rev B, plus cleaning up warning/debug messages for iMUSE
Midi. This patch fixes some Sam and Max music issues by implementing
MIDI SysEx 1 (maybe_jump)

svn-id: r5120
2002-10-10 15:06:02 +00:00
Paweł Kołodziejski
0c5b62b2e4 update map table (imuse)
svn-id: r5115
2002-10-09 17:54:18 +00:00
Jamieson Christian
4217ee8bb9 Revised GM-to-FM instrument table.
svn-id: r5114
2002-10-09 09:39:07 +00:00
Paweł Kołodziejski
621b9a5a9e corrections to music map table
svn-id: r5112
2002-10-08 22:28:14 +00:00