libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-23 10:19:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
12,441 Commits 5 Branches 5 Tags 1.8 GiB
50d64c1329
Commit Graph

226 Commits

Author SHA1 Message Date
Jamieson Christian
33c8c2fae8 Fixed panning issue 
svn-id: r7524
 2003-05-15 13:56:41 +00:00
Max Horn
8188d946b3 fixed warning 
svn-id: r7383
 2003-05-07 22:50:15 +00:00
Jamieson Christian
15bf5ba885 ..\..\msg.txt 
svn-id: r7382
 2003-05-07 19:24:14 +00:00
Jamieson Christian
a0c98d1f14 Interim fix for Bug [712042] FOA: Lockup. 
Final fix will require a savegame format mod.

svn-id: r7358
 2003-05-05 16:07:10 +00:00
Max Horn
2b74abd2c9 PalmOS changes 
svn-id: r7224
 2003-04-30 13:23:31 +00:00
Jamieson Christian
2a1e87fa7c Revised fix to bug [666187] DOTT: Coffee music never stops 
svn-id: r7021
 2003-04-19 14:23:40 +00:00
Jamieson Christian
20e22e6f29 Fix for bug [666187] DOTT: Coffee music never stops 
svn-id: r7016
 2003-04-18 14:38:31 +00:00
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
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
Paweł Kołodziejski
3e9ad58762 ops 
svn-id: r5111
 2002-10-08 19:42:36 +00:00
Paweł Kołodziejski
63762d48de synced with local sources (imuse) 
svn-id: r5110
 2002-10-08 19:35:39 +00:00
Paweł Kołodziejski
15675e5652 added delay before start playing sample to get chance for doComand 
svn-id: r5109
 2002-10-08 14:32:19 +00:00
Paweł Kołodziejski
42089431bd synced with local sources (imuse) 
svn-id: r5107
 2002-10-08 07:30:50 +00:00
James Brown
bbc1567526 Patch 614005b - mi2-carnival.diff fix by eriktorbjorn 
svn-id: r5101
 2002-10-06 15:44:16 +00:00
Paweł Kołodziejski
ade5247776 full redraw after smush movie and changes in debug 
svn-id: r5096
 2002-10-06 08:22:45 +00:00
Paweł Kołodziejski
6b640a5dc4 fixed looping in FT and changed debug level 
svn-id: r5095
 2002-10-06 08:17:04 +00:00
James Brown
9612002d78 Full Throttle / The Dig fixes. 
drawDescString (for Full Throttle object names, in the 'ring of fire') is
still somewhat broken. Feel free to fix ;)

svn-id: r5090
 2002-10-06 06:09:32 +00:00
Paweł Kołodziejski
14831e74bf imuse: ahh, fixing previous patch 
svn-id: r5089
 2002-10-05 20:36:49 +00:00
Paweł Kołodziejski
74fb8f2293 imuse: cleanup doCommand 
svn-id: r5088
 2002-10-05 20:22:56 +00:00
Paweł Kołodziejski
01ccb6be9a added looping voc samples in imuse(not tested) 
svn-id: r5087
 2002-10-04 08:04:35 +00:00
Paweł Kołodziejski
aa2d21d68e FT also use Imuse 
svn-id: r5086
 2002-10-03 23:16:10 +00:00
Paweł Kołodziejski
121e26cf51 fix for offset mixer size 
svn-id: r5084
 2002-10-03 08:31:50 +00:00
Paweł Kołodziejski
9e0906c723 added prebuffer (if new_mixer -> mixer_size*2) (imuse) 
svn-id: r5083
 2002-10-03 08:03:41 +00:00
Paweł Kołodziejski
830dfe090f changes in loops in imuse 
svn-id: r5082
 2002-10-03 07:42:25 +00:00
Paweł Kołodziejski
b8e5c8f76e synced with local sources 
svn-id: r5080
 2002-10-03 07:17:14 +00:00
Paweł Kołodziejski
87ae5b24c7 fix for imuse 
svn-id: r5078
 2002-10-02 18:51:58 +00:00
Paweł Kołodziejski
98d90696ad added panning control in imuse and reverse stereo support 
svn-id: r5076
 2002-10-02 17:31:55 +00:00
Paweł Kołodziejski
e10366ec3d added stubs for ImuseDigital::doCommand 
svn-id: r5070
 2002-10-02 06:31:47 +00:00
Max Horn
a1f749994f unsigned <-> signed, local vars were not inited 
svn-id: r5065
 2002-10-01 22:39:15 +00:00
Paweł Kołodziejski
7d6ebdc289 added stopAll in Imuse 
svn-id: r5064
 2002-10-01 21:19:52 +00:00
Paweł Kołodziejski
e3cd40f700 synced with local sources - imuse 
svn-id: r5060
 2002-10-01 17:20:05 +00:00
Paweł Kołodziejski
d6db8560c6 fixed ending of non loop sounds 
svn-id: r5057
 2002-10-01 06:46:50 +00:00
Paweł Kołodziejski
347b80100f fixed loop in imuse 
svn-id: r5055
 2002-09-30 22:35:32 +00:00
Paweł Kołodziejski
a9c1eb6075 synced with local sources (imuse) 
svn-id: r5053
 2002-09-30 19:10:35 +00:00
Paweł Kołodziejski
c601bbd964 synced with local sources - imuse for the dig 
svn-id: r5049
 2002-09-30 06:04:50 +00:00
James Brown
c28f592475 Fix compilation for Visual Studio and GCC, as broken by Fingolfins checkins 
Derive something useful from patch 616301

svn-id: r5048
 2002-09-30 04:36:19 +00:00
James Brown
f54715b4c4 Patch #616155: Set Monkey1VGA music instruments dynamically 
svn-id: r5035
 2002-09-29 15:14:54 +00:00
James Brown
dfdb1f7547 Merge in 615745: GMD via AdLib emulation 
Remove MIDIEMU driver obsoleted by patch.
Change functionality to fallback to AdLib/AdLibGMD Emulation where MIDI init fails
Switch to NewGUI by default (old code retained 'Just in case')

svn-id: r5033
 2002-09-29 11:11:42 +00:00
Paweł Kołodziejski
037b08130e framework of Imuse sound for The Dig 
svn-id: r5031
 2002-09-29 07:08:31 +00:00
Max Horn
1bfaa3c02f removed even the last traces of Scumm dependencies from NewGUI. Yes, you heard right NewGUI is now 100% Scumm free and we can go for the launcher/message dialogs! 
svn-id: r5016
 2002-09-24 23:45:25 +00:00
Max Horn
fbe9c544de tied to fix 'non-POD type' warning in some GCC versions; moved some common code to saveload.h 
svn-id: r4997
 2002-09-22 02:53:15 +00:00
Travis Howell
004c6ddec9 Commited the following patches 
[ 606595 ] Fix for Sam & Max animation glitch
[ 607175 ] Possible fix for bug #590511
[ 607677 ] Partial workaround for bug #566062
[ 607713 ] patch for bug 580350 (MI2 F5 crash)

svn-id: r4924
 2002-09-11 13:28:34 +00:00
Jean-Yves Simon
5b8eb34406 patch attempts to fix the MI2 music bug pointed out in bug report #551028 
svn-id: r4908
 2002-09-09 05:03:55 +00:00
Max Horn
523d8e64c0 rewrote config class; cleanup; code restructuring 
svn-id: r4903
 2002-09-08 01:08:12 +00:00
Max Horn
41c2d6fba3 sound system cleanup 
svn-id: r4867
 2002-08-29 23:45:15 +00:00
Paweł Kołodziejski
0ad222a7ad better SFX suport in the Dig 
svn-id: r4852
 2002-08-25 15:06:53 +00:00
Max Horn
657f6a86f5 fixed warning 
svn-id: r4825
 2002-08-24 16:13:16 +00:00
Paweł Kołodziejski
9f993a1d29 synced with scummvm 
svn-id: r4821
 2002-08-24 15:31:37 +00:00
Max Horn
08b161f113 fix for bug #598938: sfx/music volume set 0 is not mute; some cleanup 
svn-id: r4805
 2002-08-23 20:33:29 +00:00
Ruediger Hanke
3b09051727 Changed MorphOS MIDI code so that data sent from different threads are no longer a problem. Ensure Midi driver is closed, otherwise no other MIDI application will run after ScummVM has exited. 
svn-id: r4801
 2002-08-22 12:09:06 +00:00
Max Horn
2ebd2ba0b5 engine.* moved to common (where it belongs); added distclean target which gets rid of the .deps dirs, too; removed -Isound 
svn-id: r4794
 2002-08-21 16:53:11 +00:00
Max Horn
ce46866403 Initial revision 
svn-id: r4785
 2002-08-21 16:07:07 +00:00