Commit Graph

157 Commits

Author SHA1 Message Date
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
Tarek Soliman
921f602ab8 JANITORIAL: Fix whitespace in pointer template arg 2012-02-15 10:07:08 -06:00
Alyssa Milburn
cd1ea99f0e MT32: Replace OS X specific exp2f call with exp2.
Suggested by clone2727 to fix the build, since buildbot's ppc
headers don't have exp2f.
2012-02-11 22:41:21 +01:00
Eugene Sandulenko
40b6b3a3af MT32: Turn off accurate WG as suggested by KingGuppy 2012-02-10 13:16:27 +02:00
Willem Jan Palenstijn
0864edea54 MT32: Fix warning
The workaround for the unused parameter warning caused a warning:
parameter 'patchNum' set but not used
2012-02-09 23:07:58 +01:00
Eugene Sandulenko
22ea849cad MT32: Hooked up ScummVM MIDI gain 2012-02-09 11:31:09 +02:00
Eugene Sandulenko
030e155eeb MT32: Update MT-32 emulator to latest Munt code
Several changes against original code were made. They were intentionally
kept to the minimum
2012-02-09 11:31:03 +02:00
Johannes Schickel
b9d1718fe1 ALL: unrecognised -> unrecognized. 2011-11-26 17:40:00 +01:00
Johannes Schickel
0affcfed9e AUDIO: Very small formatting fix. 2011-11-20 04:37:21 +01:00
athrxx
4eab4f931f AUDIO: remove 2 superfluous lines in Kyra1/Kyra2/LoL FM-Towns/PC-98 sound driver 2011-11-03 23:05:03 +01:00
athrxx
ced0fcf054 FM-TOWNS AUDIO: make constructor of TownsAudioInterfaceInternal private 2011-11-01 20:29:55 +01:00
Johannes Schickel
3ddb6c0c90 AUDIO: Adapt include guard names to the "new" directory name. 2011-10-28 12:27:50 +02:00
Johannes Schickel
0e8110d3db AUDIO: Slight adaptions of SID code to our guidelines.
This only touches #include usages and the include guard of sid.h.
2011-10-28 12:23:50 +02:00
Johannes Schickel
36ce418854 AUDIO: Sync DOSBox OPL code a bit.
This only touches a line which is not used in the current setup.
2011-09-23 20:32:16 +02:00
athrxx
867f2887e8 SCUMM FM-TOWNS: fix invalid mem accesses
- handle some invalid sound resources that come up when starting LOOM
- fix typo in midi driver code (causing invalid mem reads)
2011-09-17 21:15:41 +02:00
Johannes Schickel
bb3d1f2738 AUDIO: Replace macro in emumidi code with enum. 2011-08-12 03:22:01 +02:00
Johannes Schickel
3635efd92c CMS: Simplify code a tiny bit. 2011-08-10 00:00:12 +02:00
Johannes Schickel
b95bbb2ace CMS: Do proper clipping of the sound data on generation.
This fixes some overflows/underflows which resulted in crackling.
2011-08-10 00:00:12 +02:00
Christoph Mallon
23a0f5318c JANITORIAL: Remove trailing empty lines. 2011-08-07 13:53:33 +02:00
Eugene Sandulenko
78f1ea7690 OSYSTEM: extended installTimerProc() with timer ID parameter 2011-08-06 11:28:35 +01:00
athrxx
b8f6257dde SCUMM: minor bug fix in FM-Towns midi driver 2011-07-10 22:19:32 +02:00
Julien
c52cc84912 AUDIO/BACKENDS/GRAPHICS: Add error checks after allocating memory with malloc 2011-06-23 15:11:36 +08:00
Max Horn
88913c0139 ALL: Remove trailing whitespaces
This tries to make our code a bit more compliant with our code formatting
conventions. For future use, this is the command I used:
  git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
2011-06-20 00:59:48 +02:00
Thierry Crozat
592cca5402 GRAPHICS: Get rid of kSODFont (ScummFont)
OSD is now using the kGUIFont instead. The main advantage is that
the kGUIFont can be used for translated text while only ASCII
characters were present in ScummFont.
2011-06-06 23:20:08 +01:00
athrxx
40422441af AUDIO: some more text tweaks 2011-06-06 17:26:36 +02:00
Willem Jan Palenstijn
5da1427d0c AUDIO: Tweak warning text 2011-06-06 12:39:06 +02:00
athrxx
43075248aa AUDIO: fix device detection (missing rom files for MT-32 emu)
This is an attempt to fix the problem Max described in his devel mail.
The presence of the rom files will now be checked in detectDevice().
In case of failure there will be fallback attempts.
The user will get notified of the detection failure if he has expressly selected the device that failed.

Please test with your platform / engine (with or without rom files).
2011-06-05 18:29:13 +02:00
athrxx
85f7a01d2a FM-TOWNS AUDIO: some cleanup in midi driver code 2011-06-03 22:08:22 +02:00
Alyssa Milburn
eb9ea8fee6 AUDIO: Fix custom AdLib percussion instruments.
The struct wasn't being zeroed out, a regression from b22ca4ff.
2011-06-03 00:06:02 +02:00
athrxx
c1f00b1e8b FM-TOWNS AUDIO: fix regression 2011-06-02 16:56:01 +02:00
athrxx
4b77a5a12e FM-TOWNS AUDIO: cleanup
(move some stuff from TownsAudioInterfaceInternal to TownsAudio_PcmChannel)
2011-06-02 12:10:51 +02:00
Max Horn
a4610df482 Merge branch 'branch-1-3-0' into master
I manually resolved all conflicts, and inspected every single change.
Many were due to the version string mismatch and thus easily resolved.
The MSVC project files add in the 1-3-0 branch were not merged,
neither where the changes to gui/themes/translations.dat.

Conflicts:
	NEWS
	backends/base-backend.cpp
	backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp
	backends/module.mk
	backends/platform/ds/arm9/makefile
	backends/platform/psp/README.PSP
	backends/platform/samsungtv/main.cpp
	backends/platform/samsungtv/samsungtv.cpp
	backends/saves/posix/posix-saves.cpp
	base/commandLine.cpp
	base/internal_version.h
	base/main.cpp
	common/array.h
	configure
	devtools/create_project/create_project.cpp
	dists/android/AndroidManifest.xml
	dists/android/plugin-manifest.xml
	dists/iphone/Info.plist
	dists/irix/scummvm.spec
	dists/macosx/Info.plist
	dists/redhat/scummvm-tools.spec
	dists/redhat/scummvm.spec
	dists/scummvm.rc
	dists/slackware/scummvm.SlackBuild
	dists/wii/meta.xml
	engines/sci/parser/vocabulary.cpp
	engines/tinsel/handle.cpp
	gui/themes/translations.dat
2011-06-01 15:15:31 +02:00
D G Turner
bea6858953 AUDIO: Fix GCC Compilation Warning in FM-Towns Softsynth. 2011-05-31 12:06:14 +01:00
athrxx
7f8a69d6fc FM-TOWNS AUDIO: fix destructors (thread safety) 2011-05-30 01:48:59 +02:00
athrxx
c60807cbb9 FM-TOWNS AUDIO: Unlock internal mutex before calling imuse timer proc. 2011-05-29 01:04:01 +02:00
Matthew Hoops
9539017ee3 ALL: initialise -> initialize 2011-05-25 11:17:11 -04:00
Max Horn
e7c642b010 AUDIO: Explicitly instantiate & name RandomSource used by MAME OPL 2011-05-23 12:13:01 +02:00
agent-q
a9b5d5e2bb DS: Fix some OPL data which was incorrectly freed from the main heap on the DS port 2011-05-21 15:46:59 +01:00
athrxx
2ef8e9a202 FM-TOWNS AUDIO: fix gcc warnings 2011-05-20 20:28:18 +02:00
athrxx
2d1fa6c3f8 FM-TOWNS AUDIO: fix thread lockups and cleanup
- fixed lockup situation in imuse destructor (only concerning the fm-towns driver)
- fixed lockup situation when AudioCDManager functions get called
(in both cases both the main thread and the mixer thread would get locked in different mutex belonging to the other thread)
2011-05-20 20:28:15 +02:00
Johannes Schickel
ffc2a93daa AUDIO: Remove leftover "forward" declaration after real declaration in the TOWNS midi code. 2011-05-20 19:30:22 +02:00
Johannes Schickel
582827df40 AUDIO: Remove SVN Id/URL keywords from a few newly added files. 2011-05-17 23:23:44 +02:00
athrxx
7804afd4cb FM-TOWNS AUDIO: hopefully fix ps2 port compile 2011-05-17 21:43:07 +02:00
Willem Jan Palenstijn
d2d002bcc2 AUDIO: Fix warning 2011-05-17 21:24:00 +02:00
athrxx
726a7f3b1a FM-TOWNS AUDIO: Fix GCC warnings 2011-05-17 20:36:32 +02:00
athrxx
d3e92f0b81 FM-TOWNS AUDIO: Fix several CppCheck warnings 2011-05-17 20:36:32 +02:00
athrxx
b3476fc801 FM-TOWNS AUDIO: Some fixes and renaming
- renamed some stuff in the new midi driver code
- fixed minor bug in midi driver code
- fixed minor bug in euphony driver code
- add some functionality to towns audio interface
2011-05-17 20:36:32 +02:00
athrxx
15610b56db FM-TOWNS AUDIO: Fix some bugs and rename some stuff in the midi driver code 2011-05-17 20:36:32 +02:00
athrxx
95c059598d FM-TOWNS AUDIO: Fix note off event in midi driver 2011-05-17 20:36:32 +02:00
athrxx
c6f13d187e FM-TOWNS AUDIO: Fix some midi driver bugs 2011-05-17 20:36:32 +02:00
athrxx
8fb5906117 FM-TOWNS AUDIO: Some midi code fixes and some renaming 2011-05-17 20:36:31 +02:00
athrxx
90a300d86c FM-TOWNS AUDIO: Improve thread safety 2011-05-17 20:36:31 +02:00
athrxx
88896117da FM-TOWNS AUDIO: Some more midi driver code 2011-05-17 20:36:31 +02:00
athrxx
75770ae691 FM-TOWNS AUDIO: Fix mod wheel setting 2011-05-17 20:36:31 +02:00
athrxx
ca0e9cca3d FM-TOWNS AUDIO: Start fixing midi driver tempo 2011-05-17 20:36:31 +02:00
athrxx
9fa1b9aa36 FM-TOWNS AUDIO: More midi driver code 2011-05-17 20:36:26 +02:00
athrxx
d9772ff88f FM-TOWNS AUDIO: Some renaming in the euphony driver code 2011-05-17 20:33:03 +02:00
athrxx
bd2c84be89 FM-TOWNS AUDIO: More midi driver code (effect processing) 2011-05-17 20:33:03 +02:00
athrxx
25814e64ac FM-TOWNS AUDIO: Implement some midi commands 2011-05-17 20:33:03 +02:00
athrxx
8fe9e89c6c FM-TOWNS AUDIO: Some more midi driver code 2011-05-17 20:33:03 +02:00
athrxx
d4325a0411 FM-TOWNS AUDIO: Implement some more midi driver code 2011-05-17 20:32:53 +02:00
athrxx
2f9c5de7be FM-TOWNS AUDIO: Implement some midi driver functions 2011-05-17 20:24:30 +02:00
athrxx
6845f25f54 SCUMM: Adapt code to latest FM-TOWNS audio driver changes 2011-05-17 20:24:30 +02:00
athrxx
63a7859351 FM-TOWNS AUDIO: Change internal interface layout 2011-05-17 20:24:28 +02:00
athrxx
5c34e33c2c FM-TOWNS AUDIO: Some more midi driver code for FM-TOWNS monkey2 and indy4 2011-05-17 20:24:24 +02:00
Max Horn
9b2ef340dc COMMON: Forbid use of some more symbols 2011-05-17 12:58:34 +02:00
Max Horn
a03ed0a3f7 AUDIO: Fix typo 2011-05-17 12:57:46 +02:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Max Horn
b22ca4ffe8 AUDIO: Change byte data tables to type AdLibInstrument 2011-05-10 14:43:53 +02:00
Max Horn
59e77ed667 ALL: Mark printf and various other symbols as forbidden
Right now, a few places in the frontend code still use printf and
consorts. We mark the affected files with a FIXME for now, and
add a dedicated exception for each. To be fixed!

Also tweak FORBIDDEN_SYMBOL_REPLACEMENT to hopefully really always
enforce a compiler error
2011-05-02 16:31:31 +02:00
Max Horn
58eebff803 AUDIO: Rename clock() -> updateClock() in SID emulator 2011-05-02 16:31:30 +02:00
dhewg
a05e2b0f43 ANDROID: Fix compilation harder 2011-04-28 20:08:52 +02:00
Ori Avtalion
9414d7a6e2 JANITORIAL: Reduce header dependencies in shared code
Some backends may break as I only compiled SDL
2011-04-28 15:08:58 +03:00
athrxx
b0008d2d33 FM-TOWNS AUDIO: fix memory leak 2011-04-21 20:22:12 +02:00
Max Horn
2e095e25f2 ALL: centre -> center 2011-04-14 14:34:28 +02:00
dhewg
b8a118eb0c ANDROID: Use the midi gain option for EAS 2011-03-27 15:30:17 +02:00
dhewg
153e67b37c ANDROID: Maybe working support for EAS DLS soundfonts 2011-03-26 11:54:17 +01:00
dhewg
703af39be5 ANDROID: Add code to dump the EAS stream to a file 2011-03-26 11:11:32 +01:00
dhewg
41762892e0 ANDROID: Fix MIDI packet size
Instruments are now not reset to the grand piano due to trailing
zeroes.
Thanks to waltervn for noticing this.
2011-03-26 11:11:17 +01:00