Commit Graph

772 Commits

Author SHA1 Message Date
Max Horn
fcf1af2ffc New CoreMIDI midi backend for OS X
svn-id: r19832
2005-12-26 11:18:25 +00:00
Max Horn
2c12614ae1 Simplify ADPCM IMA decoding (based on IMA docs). The result will only be 99.9% identical, but the code should be faster on most modern machines
svn-id: r19777
2005-12-11 13:18:27 +00:00
Max Horn
3107d08f27 Unified IMA code a little bit
svn-id: r19767
2005-12-09 22:04:28 +00:00
Max Horn
e0e1dcda08 URL pointing to an IMA format reference
svn-id: r19766
2005-12-09 21:42:19 +00:00
Lars Persson
6ed67205ec 1. New build structure for Symbian builds to allow easier build and project updates
2. Updated framework files for new structure
3. Uncommented Debug statements in vorbis.cpp (Should probably be removed alltogether.
4. Incorporated Sevs code formatting changes in the new Symbian source structure.
5. Removed/Changed EScummVM to ScummVM instead, hopefully most cases covered.
6. Beginning vibration support to be used for Scumm shake effects (Work ongoing by SumthinWicked)
7. Replaced the ScummVM icon for the FavIcon and upscaled the icon to 32x32. I think it looks ok, comments are welcome.
8. Built for S60V1 and UIQ2 targets from the cvs
9. Updated Readme with new build instructions.

Any comments are welcome.  Hopefully the other builds are not affected by this and all Sevs code updates are also incorporated.

svn-id: r19739
2005-12-03 21:29:13 +00:00
Chris Apers
64bfec97d9 Not needed anymore :)
svn-id: r19735
2005-12-03 19:04:33 +00:00
Johannes Schickel
3a9bd3c18c Fixed (wrongly) changed address in the header.
svn-id: r19733
2005-12-03 13:31:09 +00:00
Lars Persson
47ad571e0c Updated to follow ScummVM coding standards i.e spaces, indents & "studpid" things fixed.
svn-id: r19728
2005-12-02 18:36:21 +00:00
Lars Persson
a6b7333b33 Working Vorbis support for Symbian OS
svn-id: r19725
2005-12-01 19:14:38 +00:00
Eugene Sandulenko
edfae828f6 Patch #1341626: "New GP32 port"
svn-id: r19710
2005-11-27 02:35:57 +00:00
Travis Howell
81a956eeb3 Revert as requested.
svn-id: r19582
2005-11-13 09:21:15 +00:00
Travis Howell
d17e916543 Fix sound looping regression in simon2 (Windows).
Sound flags were been reset.

svn-id: r19557
2005-11-11 06:43:38 +00:00
Joost Peters
f94b11ec55 the PSP port of libtremor was updated, so this define is no longer needed
svn-id: r19488
2005-11-06 13:49:52 +00:00
Max Horn
5e75092dec Avoid using powf/expf/logf under Mac OS X, as they cause binary & compile incompatibilities with older system versions
svn-id: r19396
2005-11-02 20:50:37 +00:00
Eugene Sandulenko
37fbcf61ad Fix MS IMA ADPCM decoder. I like Microsoft so much for reinventing another
standard.

svn-id: r19203
2005-10-21 02:00:12 +00:00
Eugene Sandulenko
4306c9344c Improved IMA ADPCM decoder. It appeared that MS violated yet another standard
and nibbles order in samples appeared to be swapped. Had to untemplate
whole thing over again because I have no idea how to speicalize one of two
parameters in templates.

Now voices are clean but have some ticks, looks like overload. ITE wasn't
broken ;)

svn-id: r19166
2005-10-19 04:59:18 +00:00
Eugene Sandulenko
a050da784f Simplified common buffer reader. Implemented now unused Microsoft IMA
ADPCM buffer reader. These folks invented ye another incompatible standard
and here it will sit #if 0'ed just for a case.

svn-id: r19164
2005-10-19 03:25:00 +00:00
Eugene Sandulenko
26ad88ec23 Fix bug #1221549 "MT32emu: doesn't compile under gcc 3.4.2 / i386"
svn-id: r19147
2005-10-18 04:26:51 +00:00
Eugene Sandulenko
b36677af71 Update FSF address. Eek. Actually that took place on May 1, 2005
svn-id: r19142
2005-10-18 01:30:26 +00:00
Chris Apers
797b6e5a7c PalmOS ARM too
svn-id: r19040
2005-10-12 19:47:15 +00:00
Torbjörn Andersson
744a01b449 Looks like my pitch wheel change still has the ability to break things. See
bug #1324103.

I've changed it - again - so that now it only centers the pitch wheels on
unload if a new mpCenterPitchWheelOnUnload property has been set. Currently
only the SAGA engine does that, so if it still breaks it only breaks SAGA.

I've also fixed what looked like an unintentional fall-through in the
MidiParser::property() function. Surently that can't cause any new
regressions? Please.

svn-id: r19032
2005-10-12 06:57:25 +00:00
Torbjörn Andersson
bb14140ca7 Moved the pitch wheel centering to unloadMusic() instead, since having it
in allNotesOff() broke the Kyra music. I have no idea why.

svn-id: r19023
2005-10-11 17:48:16 +00:00
Torbjörn Andersson
abb9ee416f Removed the "reset all controllers" message. It currently breaks on Adlib,
and I don't want to have to worry about it. Centering the pitch wheel is
the change that I primarily wanted to make, and that should be supported by
every MIDI driver we have.

svn-id: r18999
2005-10-10 09:31:27 +00:00
Torbjörn Andersson
5b92d1e9fa I noticed yesterday that if you change music in IHNM at the "right" moment,
the music will be horribly out of tune because the pitch wheel setting from
the old music will still apply.

I hope allNotesOff() is the correct place to ensure that the pitch wheel is
centered.

svn-id: r18998
2005-10-10 07:00:31 +00:00
Eugene Sandulenko
2b1d4ef990 Fix regression caused by recent code cleanup. Each input byte should be
processed twice, so even if stream end is reached, there should be another
iteration. Otherwise it always returned one byte less than expected.

svn-id: r18859
2005-09-22 20:45:46 +00:00
Max Horn
7aa398a9d0 Clarify the AudioStream::readSample requirements
svn-id: r18844
2005-09-18 14:49:54 +00:00
Max Horn
114efafe7d Cleaned up the ADPCM code
svn-id: r18840
2005-09-17 10:58:01 +00:00
Joost Peters
42d01d468d libtremor is installed to a different location when using the port from pspdev svn
svn-id: r18838
2005-09-17 10:28:50 +00:00
Gregory Montoir
ad3c2e1dbc committed patch #1281714 'Kyra 1 Sound Patch'. Thanks LordHoto.
svn-id: r18807
2005-09-11 14:35:34 +00:00
Chris Apers
5870531184 Change PalmOS ident
svn-id: r18756
2005-09-03 18:05:19 +00:00
Jonathan Gray
603a5e4d6f Don't explicity check for tremor and vorbis everywhere and
require both USE_TREMOR and USE_VORBIS to be defined when
using tremor.

svn-id: r18642
2005-08-10 12:42:56 +00:00
Jonathan Gray
3c1b5648ae Rest of the changes required for tremor to actually work.
Based on patches against 0.7.1 by Jolan Luff.

svn-id: r18641
2005-08-10 06:16:26 +00:00
Eugene Sandulenko
6b4484472b Remove trailing whitespaces.
svn-id: r18604
2005-07-30 21:11:48 +00:00
Torbjörn Andersson
f7749e4789 I believe this fixes a GCC 4 compile error, but I can't run the MT-32
emulator (my computer is too slow, and anyway I don't have the necessary
data files) so I haven't tested it other than by compiling it.

See bug #1224138 for details.

svn-id: r18558
2005-07-19 17:30:49 +00:00
Max Horn
8a59ff208c Fix more GCC 4.0 warnings
svn-id: r18533
2005-07-11 00:48:27 +00:00
Jerome Fisher
407dd03e28 - Small changes to sync with Munt.
svn-id: r18488
2005-07-03 22:56:51 +00:00
Jonathan Gray
2e273bad42 Enhanced tremor support from Jolan Luff.
The configure script now works as follows for detection:
Tremor only: use tremor
Vorbis only: use vorbis
Both: use vorbis

This behaviour can be changed with newly added configure script options.

svn-id: r18478
2005-06-30 09:14:36 +00:00
Max Horn
48a00b6846 Fix warning
svn-id: r18469
2005-06-26 23:47:19 +00:00
Lars Persson
f001a43830 Updated Scummvm MP3 implementation with patch so it works with Symbian multithreading. This openingen/closing the file for each chunk to read. This does only affect the Symbian build and the other ports should work as normal.
svn-id: r18466
2005-06-26 19:44:55 +00:00
Max Horn
02568d4498 oops forgot this in my previous commit
svn-id: r18457
2005-06-24 16:39:17 +00:00
Max Horn
9da50d6662 Fixed Oki table entry; added doc URL; mention IMA ADPCM
svn-id: r18456
2005-06-24 16:21:10 +00:00
Torbjörn Andersson
40236ee7c1 For consistency, specify directory when including files.
svn-id: r18454
2005-06-24 16:16:46 +00:00
Max Horn
8b1d7b9166 When including files from common/, explicitly use the common/ prefix
svn-id: r18444
2005-06-24 15:23:51 +00:00
Lars Persson
1c69696a9a Patches needed to build for SYMBIAN32 WINS/GCC added.
Test built for Symbian and run on P910i without any major problems.
Test built for MSVC6. Changed parts seems to compile ok but there are some problems with MSVC6 and some of the targets which the EPOC build does n't support (KYRA,SAGA).

svn-id: r18430
2005-06-21 22:08:21 +00:00
Max Horn
21efddda22 Added virtual destructor, to silence a few more GCC 4 warnings
svn-id: r18420
2005-06-20 18:27:33 +00:00
Torbjörn Andersson
eeab93cf09 More whitespace changes.
svn-id: r18273
2005-05-27 12:43:19 +00:00
Oliver Kiehl
868f2b3f71 Mixer is now in namespace Audio. fix compiling.
svn-id: r18056
2005-05-11 17:20:32 +00:00
Max Horn
2de46dc8eb Moved some more stuff to namespace Audio (enough for tonight)
svn-id: r18040
2005-05-11 00:01:44 +00:00
Max Horn
1a615346ab Moved class SoundMixer to Audio::Mixer (didn't call the namespace 'Sound' because we already have many classes with that name)
svn-id: r18039
2005-05-10 23:48:48 +00:00
Max Horn
72f4c03b0b Moved (In/Out)SaveFile(Manager) and Timer to namespace Common
svn-id: r18038
2005-05-10 23:17:38 +00:00
Max Horn
b75c969e66 Moved class File and the MD5 stuff to namespace Common
svn-id: r18037
2005-05-10 22:56:25 +00:00
Paweł Kołodziejski
39cb499fcf fixed warning
svn-id: r18012
2005-05-09 22:38:44 +00:00
Max Horn
52bbc86797 Patch #1181544 (AmigaOS 4 changes)
svn-id: r18011
2005-05-09 21:21:21 +00:00
Max Horn
9bfc9281a1 Fix doxygen message
svn-id: r18000
2005-05-09 12:26:07 +00:00
Max Horn
cca744f69a Comply to our coding conventions
svn-id: r17975
2005-05-08 21:49:52 +00:00
Max Horn
d00117ec4b Fixed some doxygen warnings
svn-id: r17923
2005-05-05 15:59:24 +00:00
Travis Howell
77d6a04abc Switch link to web page with more detailed information on compression types.
svn-id: r17905
2005-05-04 01:57:03 +00:00
Eugene Sandulenko
575e94602c o Fixed ADPCM decoder length bug
o Plugged IMA ADPCM into SCUMM engine so latter HE titles now have speech
  though it is somewhat noisy don't know why as decoder is based on ADPCM
   reference implementation.

svn-id: r17904
2005-05-03 22:12:23 +00:00
Eugene Sandulenko
a71d60686c Moved Oki ADPCM aka VOX decoder from SAGA engine to common sound/ directory.
Implemented IMA ADPCM decoder.

svn-id: r17903
2005-05-03 20:36:07 +00:00
Max Horn
969ef3dac9 * Added new virtual base class 'Stream', ReadStream and
WriteStream are now subclasses of it.
* Added new methods eos(), ioFailed(), clearIOFailed() to
  all streams. This allows better error checking.
* SaveFile classes take advantage of these new standard
  stream APIS
* Removed File::gets()
* Added SeekableReadStream::readLine() (replaces File::gets)
* Added WriteStream::writeString, for convenience

svn-id: r17752
2005-04-22 17:40:09 +00:00
Gregory Montoir
8b559ff875 code conventions
svn-id: r17714
2005-04-20 11:13:56 +00:00
Gregory Montoir
5a930d8fe7 this should fix bug #1181979
svn-id: r17713
2005-04-20 11:03:36 +00:00
Andrew Kurushin
b31ee93c75 vc compile warn
svn-id: r17637
2005-04-16 17:05:14 +00:00
Gregory Montoir
0f3ab2206a Only cache a track if it really exists, this should prevent some issues when playing with invalid compressed tracks. See also bug report #1181979.
svn-id: r17591
2005-04-13 19:50:58 +00:00
Max Horn
839c8add38 Get rid of errno; add some (optional) error checking facilities to SaveFile classes (they are ugly, and to simple, but better than nothing)
svn-id: r17589
2005-04-13 18:36:55 +00:00
Eugene Sandulenko
bdbd56406c Patches #1164217 "Updated GS Support + Percussion Remapping Patch" and
#1181750 "Updated Native MIDI documentation". Thanks _tom a lot.

svn-id: r17571
2005-04-13 00:11:49 +00:00
Torbjörn Andersson
d4d045b117 Forgot to add files when committing patch #1175374.
svn-id: r17513
2005-04-10 14:35:11 +00:00
Torbjörn Andersson
13dc149ded Applied patch #1175374 ("FluidSynth MIDI driver"), with a few documentation
changes. There are a few things that could use a bit more work, and I've
only tested it on my Linux box. I have verified that ScummVM still compiles
when it's disabled, though, so it shouldn't break anything too badly.

svn-id: r17512
2005-04-10 14:33:44 +00:00
Jonathan Gray
24c92d0091 Remove usage of vsprintf in favour of vsnprintf and make
more use of STRINGBUFLEN.  Some ports may need a new stub for
this, discussed with Chrilith.

svn-id: r17463
2005-04-09 01:52:44 +00:00
Max Horn
9e2e00881f Renamed getActiveChannelSoundID to getSoundID and fixed its semantics to avoid race conditions
svn-id: r17377
2005-04-04 17:43:00 +00:00
Travis Howell
f230fe65e8 Add 8 sound channel support for HE games
-Allows sound looping to work

Added support for WAVE format musuc used in later HE100 games.

svn-id: r17372
2005-04-04 11:43:25 +00:00
Jerome Fisher
eda317924e Committed patch #1168149 (Shared GM/MT-32 mapping) by eriktorbjorn as-is. This does the following:
- Replaces multiple identical MT-32-to-General MIDI mapping tables with a common one in MidiDriver.
- Changes Sky's GmChannel class to allow NULL instrument and velocity mapping tables, giving a 1-to-1 mapping without creating a dummy table.

svn-id: r17361
2005-04-03 22:01:38 +00:00
Max Horn
3084724d7d To prevent race conditions, SoundMixer::isSoundHandleActive must lock the mixer mutex. That change might however cause regressions (read: dead locks) if some code calls isSoundHandleActive from within a sound callback... if you encounter any, please tell me
svn-id: r17209
2005-03-23 16:41:44 +00:00
Max Horn
61d0e3f02c Make sure SoundHandle's are inited
svn-id: r17194
2005-03-22 18:29:02 +00:00
Jerome Fisher
7f83c47860 Merged with latest Munt CVS.
* Added support for most of the extended capabilities of the CM-32L/LAPC-I (more rhythm timbres, more rhythm key mappings, more PCM samples).
* The control ROM is now identified by searching for matching ID strings at various locations in the file. There are now a lot of safety checks to help ensure that a bad ROM will not crash the emulator.
* Three control ROM versions are now identified and mapped out - an original MT-32 control ROM, an original CM-32L ROM, and the Blue Ridge modified MT-32 ROM.
* Now supports the expression controller properly.
* Sustain is now turned off correctly again.
* "All Notes Off" no longer stops notes held by the sustain controller.
* Implemented "Reset all controllers".
* Stereo pan positions are no longer inverted.
* Volume, pitch, filter and envelopes are now more accurately calculated. Overall, the sound emulation is much more accurate.
* Waveforms are now slightly more accurate (in terms of pitch), necessitating a regeneration.
* Handling of unusual sysex messages has been improved (fixes sysex messages from Java's MIDI classes on Windows).
* Fixed a reverb bug during periods of silence.

svn-id: r17188
2005-03-20 16:24:55 +00:00
Max Horn
0e784d41d7 Simplified SoundHandle implementation
svn-id: r17107
2005-03-12 20:26:49 +00:00
Max Horn
7cd2cb2b17 PlayingSoundHandle -> SoundHandle; also, turned the handle activity check into a mixer method
svn-id: r17106
2005-03-12 18:56:09 +00:00
Chris Apers
a68d6ad671 PalmOS : ARM optimized OPL driver
svn-id: r17079
2005-03-11 11:01:52 +00:00
Max Horn
0ec193b4be changing AudioDataType -> SoundType, so now the constant names match the name of the data type / the SoundMixer method names
svn-id: r17052
2005-03-09 18:12:54 +00:00
Max Horn
b7c2926a0b Typo
svn-id: r17006
2005-03-06 13:23:39 +00:00
Max Horn
cda823ea63 It's kMaxMixerVolume, not 256 (we might change it to 255 eventually)
svn-id: r16747
2005-02-06 20:35:06 +00:00
Travis Howell
bebad400d6 Check sound queue for music in HE games.
Avoid extra sound channel.

svn-id: r16706
2005-01-30 11:03:49 +00:00
Max Horn
abd12dd1b6 Use class Mutex instead of MutexRef
svn-id: r16679
2005-01-28 22:05:51 +00:00
Nicolas Bacca
2f8f982f7d Add medium quality sound for FOTAQ
svn-id: r16676
2005-01-28 20:46:36 +00:00
Torbjörn Andersson
9eecc9406d 16-bit WAVs are little-endian.
svn-id: r16539
2005-01-11 08:30:28 +00:00
Torbjörn Andersson
13e2c224c8 This is probably not the optimal fix, but at least ScummVM compiles again.
svn-id: r16538
2005-01-11 08:06:19 +00:00
Max Horn
ec79a9a768 A little more moving around #include's (last one for today ;-)
svn-id: r16534
2005-01-10 22:51:42 +00:00
Max Horn
f030081647 eek, we put a static RandomSource instance into every file that included fmopl.h...
svn-id: r16532
2005-01-10 22:46:23 +00:00
Max Horn
5c48717dd2 Remove some more header dependencies
svn-id: r16530
2005-01-10 22:35:43 +00:00
Max Horn
cffd917165 system.h was being included in tons of places, without any good reason; reduced this (total dependencies on system.h went down from 193 to 85 files)
svn-id: r16527
2005-01-10 22:06:49 +00:00
Max Horn
51112e49b5 Fix legal header
svn-id: r16506
2005-01-09 16:14:56 +00:00
Max Horn
9cea3d393f Added shared code to load WAV(E) data from arbitrary seekable streams (files or memory)
svn-id: r16502
2005-01-09 15:49:43 +00:00
Max Horn
eeea238ef7 This function is currently not used...
svn-id: r16501
2005-01-09 15:48:47 +00:00
Max Horn
0fb2bd30f4 cleanup
svn-id: r16500
2005-01-09 15:48:27 +00:00
Max Horn
32f0dbdcb2 Moving AppendableAudioStream into SCUMM engine, as it is only used there
svn-id: r16494
2005-01-09 03:15:59 +00:00
Max Horn
c6e0d31e76 Added a font manager (work in progress)
svn-id: r16460
2005-01-06 21:15:52 +00:00
Max Horn
5d88c39549 Modify the singleton code once more to help overcome an issue with MSVC 7 (see also patch #1095133)
svn-id: r16454
2005-01-06 18:38:34 +00:00
Travis Howell
ab432327d8 Add missing control changes, patch #1094825.
svn-id: r16416
2005-01-03 11:33:12 +00:00
Max Horn
74bf578bda Changed the singleton code to allow for custom object factories; this allowed me to change OSystem to use the singleton base class, too
svn-id: r16404
2005-01-01 19:19:06 +00:00
Max Horn
f52be9df68 Changed OSystem::instance() to return a reference, not a pointer (it now matches the Singleton interface)
svn-id: r16402
2005-01-01 18:53:47 +00:00