Commit Graph

199 Commits

Author SHA1 Message Date
Paweł Kołodziejski
c10cce6af1 fixed warnings
svn-id: r15665
2004-10-23 13:39:03 +00:00
Torbjörn Andersson
879c2562e6 More cleanup. Too bored to go on.
svn-id: r15664
2004-10-23 13:23:46 +00:00
Torbjörn Andersson
62ca7b6644 Cleanup
svn-id: r15663
2004-10-23 13:17:03 +00:00
Torbjörn Andersson
4d8bc9862c Cleanup
svn-id: r15662
2004-10-23 13:02:05 +00:00
Torbjörn Andersson
07a6802dff Cleaned up axtoi()
svn-id: r15661
2004-10-23 12:50:31 +00:00
Torbjörn Andersson
1a36eeda0e ScummVM style (partial)
svn-id: r15653
2004-10-22 15:59:11 +00:00
Max Horn
5c53a3e260 cleanup
svn-id: r15652
2004-10-22 15:56:39 +00:00
Torbjörn Andersson
bf588c163f ScummVM style.
svn-id: r15651
2004-10-22 15:48:56 +00:00
Torbjörn Andersson
a4eb97da4c Replaced the Bit* data types with ScummVM's int* and uint* types. The
64-bit type has been renamed int64 and uint64. As a consequence, bug
#1051999 (the MinGW compilation problems) is now fixed.

svn-id: r15650
2004-10-22 15:39:28 +00:00
Torbjörn Andersson
e88cd31e4d Indentation
svn-id: r15646
2004-10-22 10:24:48 +00:00
Torbjörn Andersson
8e1481ae8f Fixed warning. Hopefully without breaking anything.
The __int64 problem remains, though.

svn-id: r15645
2004-10-22 10:13:18 +00:00
Travis Howell
3843b6cb02 Correction for mingw compile
svn-id: r15644
2004-10-22 09:38:11 +00:00
Max Horn
5c87bcafa6 Fix sign warnings
svn-id: r15638
2004-10-21 23:03:09 +00:00
Eugene Sandulenko
9d0b746aaa Patch #1048326 Better MT-32 support
svn-id: r15635
2004-10-21 22:37:37 +00:00
Max Horn
72df42e047 Fix for bug #1049937 (FOA: Regression in Adlib music)
svn-id: r15618
2004-10-19 23:03:04 +00:00
Torbjörn Andersson
61e438df22 Made the calculation of _samples_per_tick a bit less prone to arithmetic
overflow. It failed if the output rate was 44100 Hz. (It didn't use to, but
somewhere along the line an unsigned value was changed to a signed. This
seemed like a better fix, though.)

svn-id: r15610
2004-10-19 08:47:10 +00:00
Max Horn
82a3d09a65 Fix warning
svn-id: r15593
2004-10-17 19:34:43 +00:00
Max Horn
267144e69c added MidiDriver_Emulated base class used by the adlib & ym2612 midi 'drivers'
svn-id: r15589
2004-10-17 17:49:45 +00:00
Max Horn
649eb19a3e Cleanup
svn-id: r15588
2004-10-17 17:12:35 +00:00
Max Horn
bdf66b1a07 Make use of the new setupPremix variant (i.e. use an AudioStream subclass instead of a premix proc)
svn-id: r15523
2004-10-11 22:19:22 +00:00
Chris Apers
2ca4529bba Use common PI value instead
svn-id: r15435
2004-10-06 10:14:31 +00:00
Chris Apers
951131e7c2 Zodiac midi driver
svn-id: r15028
2004-09-12 11:14:14 +00:00
Max Horn
759cd67de5 cleanup of TimerProc mess
svn-id: r14683
2004-08-22 13:27:34 +00:00
Jonathan Gray
d1616e1cb5 Add passthrough ability. Patch by Christian Schoenebeck with slight modifications
svn-id: r14354
2004-07-27 13:21:52 +00:00
Torbjörn Andersson
578b87b856 Reverted to the old random_nr() function. This appears to have been the
cause of bug #916886: Calling getRandomNumber(-1) causes ScummVM to crash,
while calling random_nr(-1) doesn't. We may still want to replace it with
getRandomNumber() later, of course.

svn-id: r13341
2004-03-19 07:36:20 +00:00
Max Horn
1b537be8d4 Patch #902111: Change remaining random function calls to use RandomSource
svn-id: r13262
2004-03-13 18:44:10 +00:00
Max Horn
d158280425 the OSystem changes we discussed on the ML (note: renaming of the existing OSystem API is not yet finished); porters will have to fix their ports to get them to compile again
svn-id: r13036
2004-02-24 22:39:42 +00:00
Chris Apers
2420bf2900 Prepare Zodiac MIDI support
svn-id: r12734
2004-02-05 13:56:39 +00:00
Joost Peters
11c8ff9544 Handle command 0xD0 (queen uses this) - thanks aholler.
svn-id: r12533
2004-01-20 10:51:53 +00:00
Max Horn
033ff78ae9 updated copyright notice
svn-id: r12176
2004-01-06 12:45:34 +00:00
Max Horn
c07a290d8c disable the reverb hack for now; at hacked in sound font support (specify 'soundfont' config option with path to a .SF2 file); simplify code a bit by using OpenDefaultComponent; allow usage of any music device, not just the DLSSynth (this may or may not help people with real MIDI devices)
svn-id: r11918
2003-12-25 17:23:49 +00:00
Max Horn
032d8ad52e fix various buglets (like, only 15 of the 16 channels were being inited; also, the 'All note off' code caused odd problems, not yet sure why. I am disabling it for now)
svn-id: r11884
2003-12-24 12:53:07 +00:00
Max Horn
e9b193f2e5 fix drum channel
svn-id: r11883
2003-12-24 02:25:59 +00:00
Jonathan Gray
7c320d63de add config file parameter to specify the desired port when using the ALSA music driver
svn-id: r11583
2003-12-11 14:38:43 +00:00
Paweł Kołodziejski
13c7acee9d cleanup whitespaces
svn-id: r11220
2003-11-08 22:57:42 +00:00
Marcus Comstedt
ef5e193d59 stdafx.h needs to be included first.
svn-id: r11117
2003-11-03 22:28:37 +00:00
Max Horn
7eab653832 cleanup
svn-id: r10894
2003-10-18 13:04:59 +00:00
Chris Apers
9033d3dbab Make PalmOS port happy
svn-id: r10843
2003-10-17 08:15:00 +00:00
Jamieson Christian
da9fcd9ceb More Euphony/YM2612 instrument layering and polyphony
fixes. Aside from variations in the instrument timbre,
the output from ScummVM now seems to match up with the
output from UNZ (MAME YM2612 emulator).

svn-id: r10672
2003-10-07 15:15:26 +00:00
Jamieson Christian
f49a741cfb Remove my trace output. :P
svn-id: r10669
2003-10-07 13:12:29 +00:00
Jamieson Christian
027543b30b More polyphony tweaks. Sounding a bit better.
svn-id: r10668
2003-10-07 13:11:54 +00:00
Max Horn
8c9dc47ee1 fixed warnings
svn-id: r10646
2003-10-06 22:33:54 +00:00
Max Horn
6cad2556ef removed unused 'rate' param from nextTick; another tiny tweak to Operator2612::nextTick (avoids one memory store over here, woohoo <g>)
svn-id: r10644
2003-10-06 15:26:01 +00:00
Jonathan Gray
5ca9daeebd remove <string> include so we don't depend on stdlib stuff (not used anyway) this also stops compile problems arising from our overloaded memory operators here
svn-id: r10643
2003-10-06 14:32:22 +00:00
Max Horn
7829083a78 malloc/new optimizations
svn-id: r10642
2003-10-06 14:15:01 +00:00
Jamieson Christian
83ace36fcc Per-channel polyphony now > 1
svn-id: r10641
2003-10-06 14:08:33 +00:00
Max Horn
52efd44852 even more optimizations
svn-id: r10639
2003-10-06 13:37:54 +00:00
Max Horn
5a1bd7574a some more tweaks
svn-id: r10637
2003-10-06 13:02:06 +00:00
Max Horn
ca13989959 some incremental changes (more will follow, this is step-by-step optimzation, watch it happen in pseudo-real-time and color. icecream is sold at the entrance, please stop smoking
svn-id: r10636
2003-10-06 12:33:40 +00:00
Jamieson Christian
94134421bc More performance optimizations
svn-id: r10629
2003-10-06 04:41:25 +00:00
Max Horn
a4150583cc oops - that happesn if you incorrectly re-apply a broken patch =)
svn-id: r10628
2003-10-06 01:25:24 +00:00
Max Horn
ef485006b1 more optimizations
svn-id: r10627
2003-10-06 01:24:22 +00:00
Jamieson Christian
97d7223bca Fix compiler warnings
svn-id: r10626
2003-10-06 01:08:38 +00:00
Jamieson Christian
f16775476f The real YM2612 implementation. Portable,
and with significant performances optimizations
thanks to Fingolfin, or optimizing emperor. :)

svn-id: r10625
2003-10-06 01:01:31 +00:00
Jamieson Christian
a722d0601e Preliminary preparation for new YM2612 FM emulator.
All the hooks are in, but actual implementation
needs to be checked for portability.

svn-id: r10615
2003-10-05 15:36:52 +00:00
Max Horn
17bf7b95aa removed duplicate g_timer object (one was global, one was static to timer.cpp); set g_system earlier (might prevent a few race conditions)
svn-id: r10471
2003-09-28 21:08:48 +00:00
Jamieson Christian
7f707acfb6 Converted the MPU-401 timer to use the Timer class.
Since this was the only place where we were using
create_thread, that method should be removable now.
I also removed the midi_driver_thread overrides
for the MorphOS and YPA1 (Palm) backends. These need
to be tested by their respective porters.

svn-id: r10414
2003-09-26 14:05:33 +00:00
Jamieson Christian
a30eb131bb Fix for Bug [810564] ALL: missing instruments with native MT-32
As defined in Patch [811623] MT-32 patch for Bug 810564

Added a channel mask to MPU-401 devices so that --native-mt32
may force the device to use only the subset of MIDI channels
actually supported by the MT-32. Also added a best-guess
interpretation of iMuse Part priority in the SysEx 0x00 msg,
since part priorities become more of an issue when the
channel count is cramped.

svn-id: r10409
2003-09-25 22:32:05 +00:00
Max Horn
9470c9f661 changed & documented the premixer semantics
svn-id: r10294
2003-09-18 16:01:33 +00:00
Torbjörn Andersson
3342a20578 Extend the ALSA version check to look at SND_LIB_MAJOR as well. They're
bound to hit 1.0 any year now.

Of course, this is completely untested.

svn-id: r10288
2003-09-18 07:27:48 +00:00
Max Horn
be9d4066e1 moved engine.* to base; this fixes some linking issues when building a barebone ScummVM (or maybe I just want to increase our CVS stats? <g>)
svn-id: r10287
2003-09-18 02:07:18 +00:00
Max Horn
925ddb1b86 moved declaration of error/warning/debug from engine.h to util.h
svn-id: r10151
2003-09-10 12:23:42 +00:00
Ruediger Hanke
191c4b9b8e use startup message, avoid possible race condition on exit
svn-id: r9833
2003-08-23 18:03:17 +00:00
Jochen Hoenicke
d1391b8f2d Changed adlib note priorities for small header games
svn-id: r9746
2003-08-17 19:31:10 +00:00
Jochen Hoenicke
3b75fa8d3c Changed on_timer frequency in adlib so V3 SFX are correctly timed.
Changed V3 conversion code to adapt to the new (correct) speed.

svn-id: r9712
2003-08-15 16:40:17 +00:00
Travis Howell
124650e073 Remove debug code that shouldn't have been commit
svn-id: r9655
2003-08-13 12:16:42 +00:00
Travis Howell
b198fbc3bb Add adlib music for indy3ega/loom and adlib sfx, patch #770862
svn-id: r9649
2003-08-12 16:09:41 +00:00
Jamieson Christian
dbc42e0fb3 Revamped the GM-to-FM emulation tables.
The new tables come directly from the Adlib driver
for the original Sam & Max distro. Sam & Max using
Adlib should now sound essentially identical to
the original distro ("a few more tests"), and other
games without specific Adlib support, such as Simon,
should sound a whole lot closer to the GM tonality.
Percussion support is now comprehensive for Sam & Max
and a lot more thorough for other games.

svn-id: r9605
2003-08-08 12:06:14 +00:00
Jamieson Christian
154e872d5a Added generic send() option to MidiChannel.
This circumvents problems doing generic send()
calls to MidiDrivers that support more than
16 MIDI channels (i.e. Adlib). Because of the
way it interacts with MidiDriver, Simon could
have run into a problem if it tried to
allocate more than 15 Adlib music channels
(though this would only happen in very, VERY
rare circumstances).

Also fixed a problem with the channel
numbering scheme used by MidiDriver_Adlib,
in particular the percussion channel number.

svn-id: r9604
2003-08-08 11:54:24 +00:00
Max Horn
75db41750e getting rid of g_mixer; removing lots of whitespace
svn-id: r9527
2003-08-05 23:58:24 +00:00
Max Horn
c431e229b3 removing whitespace
svn-id: r9526
2003-08-05 23:57:37 +00:00
Ruediger Hanke
c99f6980c7 Hotfixes ...
svn-id: r9514
2003-08-05 18:18:26 +00:00
Travis Howell
318a6dc408 Rvert this non-smallheader adlib change
svn-id: r9491
2003-08-05 12:43:03 +00:00
Travis Howell
8bf012d966 Add adlib music improvements for indy3/monkeyega/monkeyvga and cleanups from patch #770862
svn-id: r9480
2003-08-05 05:21:57 +00:00
Jamieson Christian
f6984add8f Fixed unit'd var in Adlib driver
svn-id: r9195
2003-07-26 19:52:34 +00:00
Ruediger Hanke
5c9ebd053e Some MorphOS port fixes
svn-id: r9136
2003-07-22 22:30:16 +00:00
Max Horn
b05e7de7bb replaced SCUMMVM_VERSION/SCUMMVM_CVS by gScummVMVersion/gScummVMBuildDate/gScummVMFullVersion; made engine.o depend on all other .o files, so that the build date in it is always up-to-date
svn-id: r9032
2003-07-15 02:16:33 +00:00
Jamieson Christian
c4455fc0fd Fix for OOB Adlib frequencies
svn-id: r8907
2003-07-11 10:47:10 +00:00
Jamieson Christian
378856a693 Post FMOPL-reversion cleanup.
svn-id: r8906
2003-07-11 10:23:13 +00:00
Jamieson Christian
8b8b964aad Reverted to "old" YM3812 (FMOPL) emulator code.
Until specific information regarding the benefits
of migrating to the new emulator can be made
available, the "old" code will remain in effect
for the benefit of slower hardware platforms such
as some WinCE-based devices.

svn-id: r8903
2003-07-11 07:14:21 +00:00
Jamieson Christian
39b37df37a Fix for Bug [766984]: FOA: Adlib sound distortion
Added check for OOB note numbers when instantiating
Adlib registers with frequency information. Must check
WHY exactly we're getting OOB note numbers (and *way*
OOB, at that).

svn-id: r8902
2003-07-11 06:25:37 +00:00
Chris Apers
aba8284008 New thread emu
svn-id: r8837
2003-07-07 08:53:05 +00:00
Oliver Kiehl
c29d39fad7 fix compile
svn-id: r8814
2003-07-06 20:19:54 +00:00
Max Horn
85c467c6a0 fixed two leaks
svn-id: r8739
2003-07-04 13:16:48 +00:00
Max Horn
3ed9aae095 const correctness
svn-id: r8727
2003-07-03 22:06:13 +00:00
Max Horn
6598673ac3 cleanup
svn-id: r8718
2003-07-02 23:24:05 +00:00
Max Horn
c9d22c69a2 fixed volume controller (compared to the core midi backend, volumes are now equal; plus this is the logical implementation :-)
svn-id: r8642
2003-06-24 11:56:43 +00:00
Jonathan Gray
9ce9ce620f fix typo
svn-id: r8495
2003-06-15 01:05:03 +00:00
Jamieson Christian
66af2e9861 Added MPU401 crash fix
svn-id: r8450
2003-06-12 17:34:34 +00:00
Torbjörn Andersson
f504809b87 Applied Jamieson630's race condition fix to the ALSA driver as well.
svn-id: r8440
2003-06-12 06:45:48 +00:00
Jamieson Christian
eb23eb1cd7 Removed unnecessary warning.
svn-id: r8436
2003-06-11 18:30:28 +00:00
Jamieson Christian
d2c952b315 Fixed race condition in MPU401 shutdown
svn-id: r8432
2003-06-11 05:54:46 +00:00
Jonathan Gray
738497ef14 actually sending the event helps too
svn-id: r8219
2003-06-01 03:39:44 +00:00
Jonathan Gray
220c2f6389 give alsa sysex more chance of working, still broken though
svn-id: r8218
2003-06-01 03:25:14 +00:00
Jamieson Christian
3103dfa1f3 Fixed SysEx errors
svn-id: r8212
2003-06-01 02:37:37 +00:00
Jamieson Christian
e2b2f8cc64 Fixed stupid SysEx error
svn-id: r8211
2003-06-01 02:25:07 +00:00
Jonathan Gray
8f4660fb5c hopefully add sysex support to alsa midi backend
svn-id: r8210
2003-06-01 02:08:47 +00:00
Jamieson Christian
f047955b0d Restored SEQ_MIDIPUTC SysEx approach
svn-id: r8208
2003-06-01 01:45:08 +00:00
Jamieson Christian
c5ecbf65cb Another slight tweak to the EV_SYSEX code
svn-id: r8201
2003-06-01 00:14:04 +00:00
Jamieson Christian
3323aa4212 EV_SYSEX definition
svn-id: r8198
2003-05-31 23:27:19 +00:00