219 Commits

Author SHA1 Message Date
Max Horn
b25a47ffc5 Patch #691696: Possible fix for Adlib regression
svn-id: r6857
2003-03-25 00:28:09 +00:00
Max Horn
be47bc121e cleanup
svn-id: r6847
2003-03-23 13:14:54 +00:00
Max Horn
0602882b18 cleanup
svn-id: r6832
2003-03-18 16:13:52 +00:00
Paweł Kołodziejski
aa3766018f updated copyrights headers
svn-id: r6726
2003-03-06 21:46:56 +00:00
Paweł Kołodziejski
093428ae9a and more cleanup
svn-id: r6718
2003-03-06 17:58:13 +00:00
Jamieson Christian
b5d8f469b6 Separated IMuseDigital into its own files.
svn-id: r6229
2002-12-28 14:40:56 +00:00
James Brown
d3ade5b23e Add skeleton music support for CMI (but codec not implemented)
svn-id: r6193
2002-12-27 11:47:00 +00:00
Ruediger Hanke
9e0e918397 Fix midi driver thread for MorphOS
svn-id: r6123
2002-12-25 12:36:29 +00:00
Max Horn
563f99b1fe more -pedantic warnings fixed
svn-id: r6109
2002-12-25 00:38:53 +00:00
Jamieson Christian
01ffb7bec2 Fix to instrument load/save
svn-id: r6051
2002-12-21 23:19:42 +00:00
Jamieson Christian
ebd2dc7f67 IMuseMonitor functionality now built into IMuse itself.
IMuseInternal no longer derives from IMuse.
This eliminates a couple layers of indirection and speeds things up.
Miscellaneous source cleanup.

svn-id: r6049
2002-12-21 21:09:36 +00:00
Jamieson Christian
f60bda7d5c Implemented new instrumentation save/load.
Save/load version is now VER_V11.
Adlib/MT-32 instrumentation is now saved and loaded.
BACK UP YOUR VER_V10 SAVEGAMES, JUST IN CASE!

svn-id: r6044
2002-12-21 20:10:47 +00:00
Jamieson Christian
799da2baef [Bug #656635] fixed.
Adlib global instrument assignments are now correct.

svn-id: r6028
2002-12-20 13:09:01 +00:00
Jamieson Christian
b708c7dd64 Miscellaneous cleanup.
svn-id: r6021
2002-12-18 17:14:05 +00:00
Jamieson Christian
f95ea3afdf Fixed problems with instruments after load.
Ignore Adlib-only music when running native MIDI.
(Can't remember why I included them in the first place,
 so until I do remember, it's coming back out.)

svn-id: r6020
2002-12-18 14:57:25 +00:00
Jamieson Christian
d622df84d1 Damn, I just fixed this a bit ago! *self-bonk*
svn-id: r6019
2002-12-18 13:53:52 +00:00
Jamieson Christian
65ee19610c Instrument definition revamp.
IMuseDriver abstract class removed.
IMuseGM is now IMuseDriver.
Miscellaneous cleanup.

svn-id: r6017
2002-12-18 13:22:40 +00:00
Jamieson Christian
3427e29e46 Fixed SysEx parse bug
svn-id: r6015
2002-12-18 09:27:46 +00:00
Jamieson Christian
71e7d1512f message.log
svn-id: r6012
2002-12-18 07:48:02 +00:00
Jamieson Christian
83df060812 Miscellaneous cleanup.
Mostly changing comments to C++ style.
Welcome to ScummVM iMuse 2.00?

svn-id: r5975
2002-12-15 01:55:27 +00:00
Jamieson Christian
e2cb8112e5 Fixed last bad artifacts of Sam & Max carnival music.
Hopefully this fix doesn't break anything else....

svn-id: r5948
2002-12-14 02:51:37 +00:00
Jamieson Christian
2b8882427e Bug [651727] fix:
Initial implementation of do_command(20).

svn-id: r5929
2002-12-13 15:49:30 +00:00
Jamieson Christian
caf0eccb2d Bug [622895] fix:
Fixed do_command(256) implementation.

svn-id: r5927
2002-12-13 15:16:40 +00:00
Max Horn
bf62494fd5 ripped out obsolete midi streaming code from backends (this may break Alsa/SEQ/Windows/Morphos compile, I tried my best, but you'll have to clean up after me)
svn-id: r5905
2002-12-11 16:09:58 +00:00
Max Horn
4ddecdad58 Patch #650085: Make saveload system extensible
svn-id: r5885
2002-12-08 16:14:29 +00:00
Jamieson Christian
b382c79a41 Fixed music overlaps when running ScummVM with the -x option
svn-id: r5872
2002-12-07 18:03:10 +00:00
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