Commit Graph
909 Commits
Author SHA1 Message Date
Matthew Hoops a396e18097 AUDIO: Finish comment 2012-12-03 09:07:33 -05:00
Torbjörn Andersson 8881f71ac5 AUDIO: Fix AdLib volume when ENABLE_OPL3 is not defined
This should ensure that when ENABLE_OPL3 is not defined, the old
code (using a lookup table) is used for calculating vol1 and vol2
(unless, of course, _scummSmallHeader is true). I hope I got it
right this time.
2012-12-01 11:48:51 +01:00
Torbjörn Andersson 5cd7e5d777 AUDIO: Fix AdLib volume regression in pre-iMUSE SCUMM games
This assumes that _scummSmallHeader = 1 means we don't care about
what _opl3Mode is when calculating the volume in mcKeyOn(). I hope
this is correct.
2012-12-01 11:43:51 +01:00
Matthew Hoops 3399b5662f AUDIO: Fix AIFF comment about supporting IMA ADPCM 2012-11-24 17:25:39 -05:00
D G Turner d654057a98 AUDIO: Fix spurious compiler warnings about use-before-set variable. 2012-11-23 19:01:38 +00:00
Johannes Schickel 7c2f5e2d0e Merge pull request #283 from lordhoto/scumm-opl3
SCUMM: Support OPL3 in Sam&Max
2012-11-22 17:28:31 -08:00
Johannes Schickel 1f69192f7d AUDIO: Remove two extra commas. 2012-11-22 02:29:57 +01:00
Johannes Schickel 761a98997c AUDIO: Disallow custom percussion instruments in MIDI->AdLib code. 2012-11-22 02:22:25 +01:00
Johannes Schickel 689497f06e AUDIO: Only enable OPL3 code in MIDI->AdLib, when we have the DOSBox emulator builtin. 2012-11-22 02:18:51 +01:00
Johannes Schickel be60a641bf AUDIO: Slight cleanup and typo fix in S&M OPL3 code. 2012-11-20 03:27:12 +01:00
Matthew Hoops b285db4db3 AUDIO: Cleanup MidiParser_QT a bit 2012-11-18 14:43:35 -05:00
Matthew Hoops ca6fdb0807 AUDIO: Ignore QT MIDI control change 0
QuickTime docs don't list it, and we shouldn't treat it as a bank select
2012-11-18 14:20:24 -05:00
Pawel Kolodziejski adcb0b8383 ALL: synced with scummvm 2012-11-18 19:07:46 +01:00
Filippos Karapetis 2c8cd2d653 MT32: Make all constant tables in the MT32Emu namespace static
Added in munt commit d4f8ebf54be0a8255af08bb24f1962afa8378096
2012-11-15 14:40:04 +02:00
Filippos Karapetis 3233edf9b8 MT32: Update the MT32 emulator to the latest munt revision
Previous munt revision was 189f607c88e7404ad99abcf4b90f23b103003ed1
(Feb 09, 2012).
Current munt revision is f969d2081d41b669c1bfebd0026b5419c09517ae
(Nov 15, 2012)
2012-11-15 14:30:41 +02:00
athrxx 17ed912ed5 AUDIO: remove unused variables in FM-TOWNS imuse driver 2012-11-11 19:14:26 +01:00
Matthew Hoops f0091af6b5 AUDIO: Don't allow skipping negative times in skipSamples() 2012-10-03 10:45:43 -04:00
Johannes Schickel abe637b0f5 AUDIO: Add support for Sam&Max's OPL3 output in our SCUMM AdLib driver.
This is an initial implementation and does not implement the differences
in voice allocation.
2012-10-01 03:10:44 +02:00
Johannes Schickel 1c024519d5 AUDIO: Add easy way to write to OPL3's secondary register set. 2012-10-01 01:50:23 +02:00
Johannes Schickel 04baadcf7a AUDIO: Switch MidiDriver_ADLIB to new OPL API. 2012-09-30 21:36:52 +02:00
Johannes Schickel 78e8b9dd59 AUDIO: Properly handle AdLibPercussionChannel::noteOff. 2012-09-30 21:28:18 +02:00
Johannes Schickel e5c41cbf9a AUDIO: Comment out unused member in AdLibPart. 2012-09-30 21:22:03 +02:00
Johannes Schickel 8eeb3f2bf9 AUDIO: Give AdLibSetParam's members more descriptive names. 2012-09-30 21:17:04 +02:00
Johannes Schickel c2d39e9152 AUDIO: Enforce method naming guidelines in adlib.cpp. 2012-09-30 21:13:07 +02:00
Johannes Schickel 2d01b7de43 AUDIO: Enforce variable naming guidelines in adlib.cpp. 2012-09-30 21:13:05 +02:00
Johannes Schickel b63950f40d AUDIO: Fix formatting in adlib.cpp.
Powered by astyle.cpp.
2012-09-30 21:12:05 +02:00
Johannes Schickel a222e0640f AUDIO: Rename global variables in SCUMM AdLib code.
This does give them slightly nicer names and also adds a "g_" prefix to them.
2012-09-30 21:11:15 +02:00
Johannes Schickel 89abab97e3 JANITORIAL: Remove trailing whitespaces.
Powered by:
git ls-files "*.cpp" "*.h" "*.m" "*.mm" | xargs sed -i -e 's/[ \t]*$//'
2012-09-26 04:17:55 +02:00
Matthew Hoops d5ed8b1901 Merge remote branch 'upstream/master' into pegasus
Conflicts:
	AUTHORS
2012-09-12 20:18:13 -04:00
Matthew Hoops bb45b24f88 AUDIO: Implement simple dynamic QuickTime MIDI channel remapping
Needed for IHNM Mac sounds
2012-09-12 14:36:17 -04:00
Matthew Hoops c023651cb3 AUDIO: Implement QuickTime MIDI channel remapping
Needed to support channels with a drum kit
2012-09-10 08:23:11 -04:00
Matthew Hoops cfe6a2b640 AUDIO: Fix QuickTime MIDI with extra info in the header
The 11th Hour Mac MIDI's now play
2012-09-09 14:59:05 -04:00
Matthew Hoops 4a458236f6 COMMON: Make QuickTimeParser::readSampleDesc take the desc size 2012-09-09 13:47:40 -04:00
Pawel Kolodziejski c6c4bc7566 ALL: sync with scummvm 2012-09-08 21:09:03 +02:00
Matthew Hoops 2cb301337a AUDIO: Fix QuickTime MIDI pitch bend 2012-09-08 11:05:47 -04:00
Matthew Hoops 8259d3cd9e Merge remote branch 'upstream/master' into qtmidi 2012-09-07 19:03:01 -04:00
Alyssa Milburn f08978a075 JANITORIAL: Remove underscores from MidiParser variable names. 2012-09-07 23:04:34 +02:00
Alyssa Milburn 763c052c67 AUDIO: Remove unused members of MidiParser_XMIDI. 2012-09-07 22:22:43 +02:00
Matthew Hoops c50d40b7bf AUDIO: Add some documentation to MidiParser_QT 2012-09-07 14:50:21 -04:00
Matthew Hoops c882ef9dab AUDIO: Make MidiParser_QT::loadMusic() detect the file type 2012-09-07 14:47:30 -04:00
Matthew Hoops 342cc027c4 AUDIO: Fix QuickTime MIDI tempo 2012-09-07 14:41:54 -04:00
Matthew Hoops f333e63397 AUDIO: Fix QuickTime MIDI end of track
The end marker is used for editing only
2012-09-07 14:33:39 -04:00
Matthew Hoops c01dfba093 AUDIO: Begin basic playback of QuickTime MIDI files
Sounds almost correct, but too fast
2012-09-07 11:48:22 -04:00
Matthew Hoops 7e2f7099c8 AUDIO: Keep track of the QuickTime MIDI time scale 2012-09-07 09:49:33 -04:00
Matthew Hoops c22f76dbbc AUDIO: Fill in _tracks from MidiParser_QT 2012-09-06 16:27:06 -04:00
Matthew Hoops cc309f4d16 AUDIO: Read in all QuickTime MIDI track data 2012-09-06 14:23:15 -04:00
Matthew Hoops 834ca0e045 AUDIO: Allow for parsing QuickTime 'Tune' files 2012-09-06 09:38:13 -04:00
Matthew Hoops c5ab2fc95f AUDIO: Clean up note request list reading 2012-09-05 23:20:12 -04:00
Matthew Hoops ac4c8cd335 AUDIO: Add parsing of the QuickTime MIDI sample description 2012-09-05 23:04:29 -04:00
Littleboy 751f5be785 AUDIO: Silence MSVC warning about un-initialized newIncrement variable 2012-09-05 20:18:25 -04:00