ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,975 Commits 45 Branches 139 Tags
cfe42b15b1bc1ab74cdad90b7dcafe6f0859ff83
Commit Graph
135 Commits
Author SHA1 Message Date
Filippos Karapetis 8a62471b21 MT-32: Sync with the latest changes in munt 2013-03-03 23:01:12 +02:00
Filippos Karapetis 7880323590 MT-32: Also replace cosf() (C99) with cos() 2013-03-03 22:59:33 +02:00
Filippos Karapetis bb7930cf9c MT-32: Avoid using sinf() (which is C99) in favor of sin() 2013-03-03 16:10:02 +02:00
Filippos Karapetis f4cc45d367 MT32: Sync with the latest changes in munt 
The major change is the addition of a refined wave generator based on
logarithmic fixed-point computations and LUTs
 2013-03-02 14:09:39 +02:00
Filippos Karapetis 8884c240fc MT32: Update copyright year 2013-03-02 13:46:11 +02:00
Filippos Karapetis 059f5ee138 MT32: Also attempt to load roms named CM32L_CONTROL.ROM / CM32L_PCM.ROM 
This was accidentally removed in commit 5711d23
 2013-02-04 23:13:53 +02:00
Filippos Karapetis e2a8c8ea86 MT32: Sync with the latest changes in munt 
This syncs our code with munt commit ee380de
 2013-02-04 23:13:53 +02:00
Johannes Schickel 59dde54519 Merge pull request #301 from lordhoto/c++11-playground 
RFC: Allow use of override and nullptr. Also allow C++11 compilation.
 2013-01-26 05:25:14 -08:00
Johannes Schickel 94edb3409f Merge branch 'eriktorbjorn-fluidsynth-settings' 
This is a manual merge of a slightly adapted pull request #296.
The changes made are:
- Each time the theme format changes, the version was increased
- default.inc has been regenerated in the same commit as the theme changes
 2013-01-26 14:00:04 +01:00
Torbjörn Andersson a188a43da6 GUI: Make the FluidSynth settings dialog a bit more like Qsynth 
To help people familiar with Qsynth (I'm not, but it seems to be
one of the more polished FluidSynth front ends), use the same
presentation and terminology for the FluidSynth settings.

More to follow.
 2013-01-26 13:36:39 +01:00
Torbjörn Andersson 681f81211f FLUIDSYNTH: Add separate dialog for FluidSynth settings 
I don't really understand what these parameters do, or what the
sensible values are, so for now the sliders are limited only by
the allowed (or, in one case, "safe") values.
 2013-01-26 13:36:37 +01:00
Einar Johan Trøan Sømåen 5d4d65d6d9 JANITORIAL: Fix ){ -> ) { 2013-01-24 20:15:13 +01:00
Filippos Karapetis a81ff52088 MT32: Sync with the latest changes in munt 
This syncs our code with munt commits 535bf96, 934c116, 1643d07 and 2eac585
 2013-01-19 15:53:54 +02:00
Johannes Schickel cc0b8594ce AUDIO: Silence C++11 narrowing warnings. 2013-01-09 07:24:37 +01:00
Filippos Karapetis 7058daaed1 MT32: Remove the screen drawing code of the MUNT debug messages (bug #3599702) 
The MUNT debug messages are called from an audio callback, which is not allowed to
update the screen, as per the OSystem documentation in common/system.h:401
 2013-01-06 22:24:27 +02:00
Filippos Karapetis 05bf234b26 MT-32: Only show MUNT debug messages for debug level 4 and above (bug #3599702) 
This avoids showing warnings in the intro of FOTAQ when using the MT-32 emulator
 2013-01-06 21:54:40 +02:00
Strangerke 3cacade68d COPYRIGHT: After a discussion it with KingGuppy, revert copyright modification in some Munt files (thanks LordHoto for pointing it) 2013-01-02 18:48:22 +01:00
Strangerke 88add32e3b JANITORIAL: Update copyright year 2013-01-02 18:32:15 +01:00
Filippos Karapetis 98ec267543 MT-32: Sync with the latest changes in munt 
This syncs our code with munt commits 3f0db2d and 2c5f314
 2013-01-02 12:42:54 +02:00
Filippos Karapetis f3ccc38e8d MT32: Add missing initialization code 
This code wasn't added when syncing with the official munt codebase
 2012-12-27 17:12:27 +02:00
Filippos Karapetis bf62205c73 MT32: Move the ROM file deletion code to the ScummVM MT32 driver 
This removes the custom ScummVM file deletion code in the munt code
 2012-12-27 17:12:26 +02:00
Filippos Karapetis 5711d23231 MT32: Update the MT32 emulator and adapt to its new API 
Previous munt commit was 84b2819 (Dec 22, 2012)
Current munt commit is 6afddaf (Dec 23, 2012)

This commit also updates the MT32 driver code to the latest munt API
 2012-12-26 21:28:34 +02:00
Filippos Karapetis d9e555afd5 MT32: Update the MT32 emulator to a newer munt commit 
Previous munt commit was f969d20 (Nov 15, 2012)
Current munt commit is 84b2819 (Dec 22, 2012)

We are still missing the changes from commit 788f7b1 onwards (Dec 22,
2012). There are bigger ROM access-related changes from that point,
which we'll have to integrate as well.
 2012-12-25 23:48:25 +02: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
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
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
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
Littleboy 751f5be785 AUDIO: Silence MSVC warning about un-initialized newIncrement variable 2012-09-05 20:18:25 -04:00
Johannes Schickel 223794fb38 ALL: Make use of defined() for the preprocessor consistent. 
This does not change the use of defined for some NDS source files, since they
seem to be (based on?) third party code.
 2012-03-17 22:02:44 +01:00
Christoph Mallon 75efdd2d84 JANITORIAL: Replace (x ? false : true) by !(x). 2012-03-13 15:43:36 +01:00
athrxx 9f19bace44 COMMON: remove unnecessary commas 2012-02-21 21:48:34 +01:00
Tarek Soliman a4798602d7 JANITORIAL: Fix missing whitespace in pointer cast 
find -name '*.h' -or -name '*.cpp' | xargs sed -r -i 's@\(([A-Za-z0-9]+)\*\)@(\1 *)@g'

This seems to have caught some params as well which is not undesirable IMO.
It also caught some strings containing this which is undesirable so I
excluded them manually. (engines/sci/engine/kernel_tables.h)
 2012-02-15 10:07:10 -06:00