Commit Graph

1060 Commits

Author SHA1 Message Date
Johannes Schickel
cd5a85036d Fixed compiling of MT32 emulator with -O2 and -Werror.
svn-id: r35040
2008-11-13 11:41:25 +00:00
Max Horn
0c501d303f Verify sanity of LinearMemoryStream params in the factory function instead of the constructor (which is replicated for each instantiation of the LinearMemoryStream template class) -> saves some bytes
svn-id: r35014
2008-11-12 12:25:26 +00:00
Torbjörn Andersson
2bbc958373 Made getSoundElapseTime() work better when the sound has been paused. A new
variable, _pauseTime, keeps track of how long the sound has been paused since the
last mixer time stamp.

svn-id: r34955
2008-11-09 13:28:59 +00:00
Torbjörn Andersson
f71e1077e0 Fixed compile error.
svn-id: r34907
2008-11-05 21:10:12 +00:00
Max Horn
f32be87633 Turned enum PluginError into Common::Error, which in the future is to be used in more places. Help with this is highly welcome
svn-id: r34906
2008-11-05 17:24:56 +00:00
Max Horn
655ce26b3f Big patch changing the signature of various Stream methods (some ports may need to be slightly tweaked to fix overloading errors/warnings)
svn-id: r34514
2008-09-13 16:51:46 +00:00
Max Horn
0378201ec7 MT32 emu: eof -> eos
svn-id: r34390
2008-09-06 20:36:47 +00:00
Nicola Mettifogo
12106a1599 Removed useless dependencies from common/file.h in common code. When complete removal was not possibile, dependency has been pushed to the cpp files from the headers.
svn-id: r34343
2008-09-05 11:41:39 +00:00
Max Horn
5c72c2fca7 Removed unused readLine code from the MT-32 emu
svn-id: r34314
2008-09-03 17:46:42 +00:00
Max Horn
55a05dc0f4 Some cleanup by peres
svn-id: r34308
2008-09-03 15:22:19 +00:00
Filippos Karapetis
2d36c08d9f Fix for MSVC warning about ambiguous usage of MIN
svn-id: r34299
2008-09-03 10:10:45 +00:00
Max Horn
8032491381 Fix (?) Solaris detection in some workaround code in the MT-32 emulator
svn-id: r34216
2008-08-30 22:26:16 +00:00
Max Horn
31320430de Partial commit of patch #2012839: Atari Patch for adding Native MIDI and Fix Compile
svn-id: r34194
2008-08-27 18:52:21 +00:00
Torbjörn Andersson
d08c3ba66b Committed my patch #2040074 ("XMIDI callback control events"). At the moment, I'm
not aware of any game that actually uses this XMIDI feature, so its primary
function right now is to silence lots of warnings while running the DOS version
of Simon the Sorcerer 2.

svn-id: r33763
2008-08-10 17:59:42 +00:00
Max Horn
fb122a08eb Print a warning if unsupported XMIDI controllers are used
svn-id: r33495
2008-08-01 16:31:40 +00:00
Max Horn
0be985ce83 Changed class File (and derived classes) to only support read-only access; added a new class DumpFile for writing
svn-id: r33412
2008-07-29 16:09:10 +00:00
Max Horn
d24e770605 cleanup / code formatting
svn-id: r32973
2008-07-09 10:42:47 +00:00
Torbjörn Andersson
c2c4963e96 On reading some more about XMIDI, I believe the NEXT and BREAK variants of the
controller are mutually exclusive cases, i.e. a BREAK simply means forget about
the innermost loop, and continue as if nothing had happened.

svn-id: r32966
2008-07-08 16:25:39 +00:00
Torbjörn Andersson
ae026486ef Fixed silly error. The NEXT_BREAK event should, of course, jump to the event
*after* the FOR_LOOP event. Apart from simplifying things, this should allow
limited number of repeats to work.

svn-id: r32931
2008-07-06 19:25:32 +00:00
Torbjörn Andersson
1cc9af6b10 Implemented Good Enough(TM) XMIDI looping. This is used by Kyrandia 2 (the
loop hack is no longer needed, and has been removed), and will be used by
Discworld.

svn-id: r32930
2008-07-06 18:37:52 +00:00
Max Horn
c45d632f3b Patch ##1956946 (Audio::Mixer internal API revision) with some tweaks
svn-id: r32828
2008-06-28 15:28:29 +00:00
Johannes Schickel
d2ce912989 Fixed getTotalPlayTime implementation for MP3InputStream.
svn-id: r32755
2008-06-22 13:26:22 +00:00
Jordi Vilalta Prat
8eac356946 Added initial interface to list music devices and their types
svn-id: r32695
2008-06-13 16:04:43 +00:00
Jordi Vilalta Prat
177993b145 Renamed MIDI plugins to Music plugins
svn-id: r32693
2008-06-13 14:30:47 +00:00
Max Horn
33fd755a0e use kMaxChannelVolume instead of hardcoding 255
svn-id: r32666
2008-06-11 11:29:34 +00:00
Max Horn
63cb8227d3 Avoid some warnings when compiling in non-DEBUG mode (i.e. with assert() disabled)
svn-id: r32435
2008-05-31 19:35:37 +00:00
Johannes Schickel
9d13d90d4f - Cleanup code for FlacInputStream::getTotalPlayTime
- Reset input stream position in MP3InputStream after calculating total play time

svn-id: r32323
2008-05-27 13:28:47 +00:00
Johannes Schickel
e82295daa3 Implemented getTotalPlayTime for MP3InputStream.
svn-id: r32322
2008-05-27 13:15:51 +00:00
Jordi Vilalta Prat
2862a30dac Fixed some code formatting thanks to LordHoto
svn-id: r32275
2008-05-26 00:28:48 +00:00
Johannes Schickel
ff573ec1e2 Instead of simply returning 0 for "infinite" looping in FLAC and OGG/Vorbis streams in getTotalPlayTime return kUnknownPlayTime.
svn-id: r32265
2008-05-24 23:58:22 +00:00
Johannes Schickel
cff8ccccc9 Take numLoops in account for getTotalPlayTime in FLAC and OGG/Vorbis streams.
svn-id: r32264
2008-05-24 23:49:15 +00:00
Johannes Schickel
aba5082d19 Implementation of AudioStream::getTotalPlayTime for FLAC and OGG/Vorbis streams.
svn-id: r32263
2008-05-24 23:39:13 +00:00
Johannes Schickel
af7bc93c46 Made AudioStream::getTotalPlayTime virtual (Ooops :-)
svn-id: r32261
2008-05-24 22:59:20 +00:00
Max Horn
68fd8b74b0 Patch #1970427: AudioStream play length querying
svn-id: r32258
2008-05-24 22:41:15 +00:00
Max Horn
182ae52a98 typo
svn-id: r32245
2008-05-24 14:44:22 +00:00
Max Horn
9f12f0c450 Move makeAdlibOPL inside the #include guards
svn-id: r32193
2008-05-20 15:36:09 +00:00
Jordi Vilalta Prat
eb6c809d2b - Added more information (ID and capabilities) to the MIDI drivers
- Added the MidiPlugin interface to the remaining MIDI drivers
- Added an initial MidiManager to handle the MIDI plugins (just static plugins by now)

svn-id: r32117
2008-05-14 14:56:29 +00:00
Jordi Vilalta Prat
d942fd42bb Moved midiplugin.h to sound/ since it will be used for more than just the native MIDI drivers.
svn-id: r32097
2008-05-14 05:47:29 +00:00
Jordi Vilalta Prat
02fbdd1f05 Removed the remaining traces of the MorphOS ETUDE driver.
svn-id: r31994
2008-05-11 02:37:41 +00:00
Jordi Vilalta Prat
d696ed6ea2 Added the MidiPlugin interface (first step towards the MIDI plugins)
svn-id: r31993
2008-05-11 02:10:05 +00:00
Johannes Schickel
600ab40bca Changed all delete [] usages to delete[].
svn-id: r31927
2008-05-07 14:31:45 +00:00
Jordi Vilalta Prat
38a8aa516e Allow static and dynamic plugins to be used at the same time
svn-id: r31888
2008-05-06 03:00:26 +00:00
Torbjörn Andersson
15b4b62fbb Fixed comments.
svn-id: r31625
2008-04-20 19:02:34 +00:00
Max Horn
372d30c815 typo
svn-id: r31500
2008-04-14 12:08:00 +00:00
Travis Howell
27a39e7f12 Add cyx patch for bug #1915657 - ELVIRA1: Amiga crashes (paula.h:108).
svn-id: r31372
2008-04-03 23:41:24 +00:00
Max Horn
b0c6a12c81 Modified Patch #1925352: Memory leak fixes
svn-id: r31244
2008-03-26 19:29:33 +00:00
Max Horn
05b159609b Removed remaining traces of the dead MorphOS backend, which itself was removed about one year ago
svn-id: r31114
2008-03-12 18:42:47 +00:00
Max Horn
eb9f0dcbf8 Completed fix for bug #1523129 (SOLARIS: solaris 8 build broken)
svn-id: r30972
2008-02-26 17:03:10 +00:00
Robin Watts
2579136dd2 Another tiny speed tweak for fmopl.cpp; replace a division with a shift.
svn-id: r30968
2008-02-26 00:29:40 +00:00
Johannes Schickel
622076e15b Fixed warning on systems with unsiged char as default char type.
svn-id: r30953
2008-02-24 14:38:19 +00:00
Jordi Vilalta Prat
672a508bdd Added CAMD MIDI driver for AmigaOS4
svn-id: r30910
2008-02-20 17:07:58 +00:00
Robin Watts
890bca8f7e Tweaks to fmopl; same net effect overall, just faster.
Eliminate divisions, floating point, and mod operation from inner synth loop.

svn-id: r30896
2008-02-17 16:12:54 +00:00
Lars Persson
c098453ea1 Added template param to CLIP since implicit cast is not working 100% on all platforms. Target type is int32 so used that.
svn-id: r30760
2008-02-03 12:34:20 +00:00
Filippos Karapetis
97eb13c22f Corrected an off-by-one error introduced with the latest cleanups
svn-id: r30743
2008-02-02 18:31:07 +00:00
Filippos Karapetis
33a534b76c Cleanup
svn-id: r30738
2008-02-02 12:27:16 +00:00
Jordi Vilalta Prat
d6c34bdc4b Fixed the spaces before tabs.
svn-id: r30667
2008-01-28 00:14:17 +00:00
Jordi Vilalta Prat
66e9d4f5e8 Removed trailing spaces.
svn-id: r30664
2008-01-27 19:47:41 +00:00
Max Horn
2c8910ade8 This 'if' should not be necessary anymore
svn-id: r30254
2008-01-05 20:40:27 +00:00
Max Horn
89da803724 Fix for bug #1795755: LOOM/FLAC: Pauses (temporary lockups) after speech
svn-id: r30252
2008-01-05 20:38:16 +00:00
Torbjörn Andersson
2147f59e36 Converted some spaces to tabs.
svn-id: r30225
2008-01-05 08:17:39 +00:00
Oystein Eftevaag
1c88ab2c47 Enabling the SMUSH/sound ARM optimizations for the iPhone. Converting any numerical expressions in the asm to absolute values (moving the expression to comments) since the iPhone assembler can't handle them, and prepending an underscore to the exported symbols (with some preprocessor magic similar to the hq3x asm for handle ports where it's not needed)
svn-id: r30093
2007-12-31 01:50:18 +00:00
Neil Millstone
df33fdd79e Fix memory leak in audiostream (I think)
svn-id: r29940
2007-12-21 18:28:59 +00:00
Max Horn
00ce6ac98d Patch #1853322: Patch for Atari ST/FreeMint
svn-id: r29906
2007-12-19 14:03:53 +00:00
Sven Hesse
79e22d29f4 Adding a method to check whether a note currently playing
svn-id: r29856
2007-12-13 23:27:36 +00:00
Max Horn
09028cc7aa Fixed typos
svn-id: r29793
2007-12-09 14:53:15 +00:00
Chris Apers
55c07ca845 Use the same define as in C++ code
svn-id: r29781
2007-12-09 11:12:42 +00:00
Gregory Montoir
b7f9d4797d doc
svn-id: r29759
2007-12-08 09:20:18 +00:00
Gregory Montoir
65779599de reverted commit #29736 with a proper fix (I think) to fmopl code
svn-id: r29741
2007-12-06 21:11:26 +00:00
Filippos Karapetis
d4831be986 Slight cleanup and commenting of the ADPCM decoder
svn-id: r29682
2007-12-01 16:31:10 +00:00
Max Horn
2a339d8ea3 Don't use M_PI, rather use our very own PI constant
svn-id: r29567
2007-11-19 12:44:54 +00:00
Filippos Karapetis
24d1eff8e4 Define M_PI if it's not defined (seems not to be defined under MSVC)
svn-id: r29566
2007-11-19 00:45:58 +00:00
Sven Hesse
b1f6be7baa Moved Gob's square wave generator to sound/softsynth/pcspk.h
svn-id: r29564
2007-11-18 23:35:09 +00:00
Max Horn
7d984d1a67 factory functions should be documented at least roughly...
svn-id: r29560
2007-11-18 21:13:08 +00:00
Gregory Montoir
c76c6e2256 added rjp1 module specific pattern playback
svn-id: r29559
2007-11-18 20:27:31 +00:00
Gregory Montoir
c0cebe93bb skip silence VOC block (used in Igor)
svn-id: r29551
2007-11-18 06:24:40 +00:00
Max Horn
c8ce5b1865 Changed Audio::makeADPCMStream so that the stream passed to it can automatically be disposed
svn-id: r29517
2007-11-16 10:05:18 +00:00
Travis Howell
3cb8d404b5 Fix loading common sample data for modules in Waxworks.
svn-id: r29511
2007-11-16 03:37:15 +00:00
Max Horn
02b929e06e Patch #1816901: MT-32 emu: Low volume
svn-id: r29378
2007-11-02 16:10:53 +00:00
Max Horn
8eb73f2694 Patch #1815526: Add TiMidity++ MIDI server support
svn-id: r29377
2007-11-02 16:01:52 +00:00
Johannes Schickel
1bf448ac37 Add DMedia MIDI driver just to the list of MIDI drivers if on IRIX, since at least the code for it is just build on IRIX and not on every UNIX system.
svn-id: r29316
2007-10-29 21:41:50 +00:00
Max Horn
4630f49f48 Patch #1800085: small 'unknown control change byte 32' patch
svn-id: r29289
2007-10-28 13:55:16 +00:00
Max Horn
9998620379 Added support for more ROM versions, see FR #1820331
svn-id: r29269
2007-10-27 18:51:37 +00:00
Nicola Mettifogo
485b70b2b0 * Changed IFF/8SVX audio to use signed data (int8), and modified Parallaction accordingly.
* Implemented proper beep in Parallaction for Amiga.

svn-id: r29226
2007-10-15 20:20:50 +00:00
Max Horn
5a07c3c552 Patch #1804801: DMedia MIDI driver for IRIX
svn-id: r29142
2007-09-30 12:12:22 +00:00
Gregory Montoir
28c1f3fbb3 removed unused function, simplified handlePattern
svn-id: r29139
2007-09-30 11:16:25 +00:00
Robin Watts
9262b47dd2 Add PALMOS sections to ARM rate conversion sound code to preserve r10
for calls back into C/C++. 

svn-id: r29117
2007-09-28 09:38:08 +00:00
Johannes Schickel
88da0d4d00 Silence some warnings.
svn-id: r29086
2007-09-24 17:14:56 +00:00
Nicola Mettifogo
258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
2007-09-19 08:40:12 +00:00
Max Horn
664446f5d8 Fixed some more warnings
svn-id: r28948
2007-09-18 20:48:42 +00:00
Max Horn
4cc9d17c34 Adding various FIXME comments to bogus (non-self-explanatory) existing FIXME comments; and some other related cleanup
svn-id: r28890
2007-09-11 09:20:39 +00:00
Chris Apers
500481c4ec Cleanup: remove obsolete code (PalmOS 68K version not supported anymore)
svn-id: r28803
2007-09-01 19:13:04 +00:00
Filippos Karapetis
99a5545702 Reverted commit #28696, as the cause for it was different and has been fixed with commit #28697
svn-id: r28699
2007-08-22 22:43:47 +00:00
Filippos Karapetis
532c8c4230 Detach the player callback handler when the music is being unloaded. Fixes bug #1734416 - "AUDIO: ITE: Random crashes with the MIDI parser"
svn-id: r28696
2007-08-22 12:20:21 +00:00
Kari Salminen
ef1fca15f0 Removed extra commas from lookup-tables' ends.
svn-id: r28676
2007-08-20 10:43:07 +00:00
Travis Howell
d764dca90f Ooops, fix typo in last commit.
svn-id: r28257
2007-07-28 07:56:58 +00:00
Travis Howell
bb2796c57a Add support for multi-tune Protracker modules used in the Amiga version of Waxworks.
svn-id: r28256
2007-07-28 07:52:24 +00:00
Max Horn
19ad20c201 Don't be so strict about un-pausing sounds which are not paused currently
svn-id: r28163
2007-07-22 11:54:35 +00:00
Max Horn
11b2806741 Removed the old (obsolete) audiostream factories for MP3/Vorbis/FLAC data which took a File pointer and a size (these were only implemented as brain-dead wrapper around the newer factory methods anyway)
svn-id: r28110
2007-07-15 18:29:05 +00:00
Max Horn
19bb631e94 Fix looping effect (at least DrMcCoy says it fixes it somehow, and I trust him in that :)
svn-id: r27835
2007-07-01 19:59:42 +00:00
Max Horn
e1bcd70436 Re-added __attribute__(packed)
svn-id: r27830
2007-07-01 18:18:43 +00:00