Commit Graph

916 Commits

Author SHA1 Message Date
Neil Millstone
dca464b06e Changes to CPU local ram allocation for DS port
svn-id: r26395
2007-04-06 18:35:35 +00:00
Max Horn
f069c5e8ff Changed the MP3 playback code again, this time hopefully fixing the problems in the MI Amiga demo
svn-id: r26392
2007-04-06 17:16:49 +00:00
Max Horn
0df4d74ae6 Fixed looping of MP3 tracks (same problem as with the FLAC tracks)
svn-id: r26389
2007-04-06 13:28:33 +00:00
Max Horn
8a1cf1c2d0 Fix looping for FLAC tracs (looping parts of a file already worked, but looping until the end of data didn't)
svn-id: r26388
2007-04-06 13:16:53 +00:00
Johannes Schickel
013d576417 Added standard fileheader. (oops)
svn-id: r26286
2007-03-24 00:09:08 +00:00
Johannes Schickel
d1645e2fbf Commit of patch #1686414 ("Kyra: FM-Towns music").
svn-id: r26285
2007-03-24 00:04:08 +00:00
Max Horn
ed54ea9155 Moved Event/EventType/keyboard enum from common/system.h (part of class OSystem) to common/events.h (part of namespace Common). Porters may have to make minor changes to their backends to get them to compile again
svn-id: r26180
2007-03-17 19:02:05 +00:00
Max Horn
15d9bc42ea Force all code to use EventManager::pollEvent instead of OSystem::pollEvent
svn-id: r26156
2007-03-17 00:53:21 +00:00
Eugene Sandulenko
06c2976fa0 More fixes for MSVC8 warnings.
svn-id: r26063
2007-03-10 15:04:06 +00:00
Max Horn
69b8d7240a Removed obsolete comment
svn-id: r25956
2007-03-04 00:18:49 +00:00
Max Horn
200bb41bfd Updated comment
svn-id: r25929
2007-03-02 17:49:08 +00:00
Max Horn
029b8c4323 Changed the order of the parameters of makeLinearInputStream to resemble Mixer::playRaw; also made makeLinearInputStream honor FLAG_LOOP (and for this, changed its loop related params slightly)
svn-id: r25926
2007-03-02 15:26:22 +00:00
Max Horn
d8cf10926b Added a warning that the mixer FLAG_ enum should not be messed with, lest iMuseDigital saves will break
svn-id: r25925
2007-03-02 15:22:38 +00:00
Max Horn
c2dbd22692 Added reverseStereo parameter to Mixer::playInputStream; changed Mixer::playRaw to use Mixer::playInputStream
svn-id: r25923
2007-03-02 14:49:07 +00:00
Max Horn
6ee03e91c7 Rephrased a comment a bit
svn-id: r25914
2007-03-01 13:51:04 +00:00
Max Horn
8c8abca6f8 Changed the AppendableAudioStream code to use a queue of buffers, instead of a fixed size wrap-around memory buffer (this reduces memory usage in some cases by 500-700k, while actually being more flexible)
svn-id: r25909
2007-02-28 14:48:26 +00:00
Max Horn
6be027afab cleanup
svn-id: r25906
2007-02-28 12:54:59 +00:00
Max Horn
7f09562d08 Changed AudioStream::openStreamFile to use the modern variant of the audio stream factories (thus, the FLAC/Ogg/MP3 files it opens are not read completely into memory anymore)
svn-id: r25839
2007-02-24 23:53:35 +00:00
Max Horn
8366420474 Remove unneeded #includes
svn-id: r25838
2007-02-24 23:41:20 +00:00
Max Horn
b3931a847d Trying to unify the order in which we try the various audio formats: Prefer FLAC (lossless) over Ogg Vorbis ('free') over MP3 -- the order is admittedly somewhat arbitrary, but at least now it's consistent across all parts of ScummVM
svn-id: r25837
2007-02-24 23:40:28 +00:00
Max Horn
65b30d84a8 Added numLoops parameter to DigitalTrackInfo::play
svn-id: r25836
2007-02-24 23:19:53 +00:00
Max Horn
8052e2ce25 Add looping support to the FLAC decoder
svn-id: r25833
2007-02-24 22:14:48 +00:00
Max Horn
5e5b37534f Replaced variable buffer in the FLAC code by a fixed on
svn-id: r25832
2007-02-24 21:25:46 +00:00
Max Horn
e32d3cafed more FLAC code cleanup
svn-id: r25831
2007-02-24 21:13:30 +00:00
Max Horn
ebfb2c57e1 Removed FlacInputStream::deleteBuffer
svn-id: r25829
2007-02-24 19:54:54 +00:00
Gregory Montoir
11e679845d some fixes and additions for FOTAQ amiga versions
svn-id: r25825
2007-02-24 18:39:08 +00:00
Johannes Schickel
7612aa5ee1 fixed comments.
svn-id: r25797
2007-02-22 20:46:09 +00:00
Max Horn
f695b21d60 FLAC code cleanup
svn-id: r25796
2007-02-22 18:42:03 +00:00
Max Horn
52eebf9192 added yet another #pragma mark to the vorbis code (just for the sake of *my* text editor -- yeah, I'm selfish :-)
svn-id: r25795
2007-02-22 18:38:05 +00:00
Max Horn
4dae49e75a cleanup
svn-id: r25794
2007-02-22 18:35:57 +00:00
Max Horn
82ae8daccf Reduce chance for overflows in VorbisTrackInfo::play
svn-id: r25793
2007-02-22 18:33:01 +00:00
Max Horn
8ce7566c8d Updated FLAC code to match the changes made to the MP3 & Vorbis decoders (e.g. use a SeekableReadStream for input, allow specifying parts of a stream via time-valued parameters, etc.) -- note: looping is not yet implemented, even though it is already present in the API
svn-id: r25792
2007-02-22 18:21:01 +00:00
Max Horn
c3254cde9e If an AudioStream returned a negative number in his readBuffer() method, then CopyRateConverter::flow could have got stuck in a (quasi) endless loop
svn-id: r25790
2007-02-22 16:36:03 +00:00
Max Horn
f16ab37698 Added looping support and an enhanced factory function to the Vorbis code
svn-id: r25789
2007-02-22 14:30:12 +00:00
Max Horn
1c02ed60d0 cleanup
svn-id: r25788
2007-02-22 14:07:12 +00:00
Max Horn
2c1445056d Rewrote Ogg Vorbis code to be more flexible when it comes to seeking; also now playback from arbitrary SeekableReadStream data sources is possible
svn-id: r25784
2007-02-22 10:51:47 +00:00
Gregory Montoir
948630c3b4 added initial support for FOTAQ amiga versions
svn-id: r25769
2007-02-21 20:27:48 +00:00
Max Horn
cb40356a7b Revamed the Ogg Vorbis & FLAC DigitalTrackInfo subclasses to work similar to the MP3 one (i.e. only open the data file when about to play)
svn-id: r25757
2007-02-20 23:40:46 +00:00
Max Horn
42745b188e Added looping to the MP3 streams (currently virtually untested, so watch out)
svn-id: r25756
2007-02-20 22:18:48 +00:00
Max Horn
acdb32d84d Remove some leftover comments I made while writing the new MP3 code; make use of the new ReadStream::readStream() method in makeMP3Stream()
svn-id: r25755
2007-02-20 21:53:22 +00:00
Max Horn
227a080e5b Patch #1663933 (Kill premix channel) with a few tiny additional tweaks by me
svn-id: r25752
2007-02-20 18:50:17 +00:00
Max Horn
91f088bb8b Rewrote MP3InputStream mostly from scratch:
- added support for  proper time-based seeking (for now internally only)
- this should permit VBR encoded MP3 audio CD tracks to be used (not tested)
- Symbian specific hacks were removed, as they hopefully aren't needed anymore
  (not tested))

This change will is likely to introduce regressions, everybody please test all
cases where we allow using MP3 encoded data

svn-id: r25750
2007-02-20 17:57:49 +00:00
Max Horn
35b191bad9 Document AudioCDManager::play
svn-id: r25742
2007-02-20 16:13:45 +00:00
Max Horn
b162e0dc04 Cleaned up AudioCDManager::getCachedTrack (in particular, don't empty a slot in the track cache if we are not going to use it)
svn-id: r25740
2007-02-20 13:50:20 +00:00
Max Horn
0b2602e424 So far we only accepted track1.* as name for audio tracks -- now we also accept track01.* (we still only document the former naming scheme, intentionally)
svn-id: r25728
2007-02-19 18:17:38 +00:00
Gregory Montoir
604f0cac0a cleanup and fixed _module memory leak
svn-id: r25708
2007-02-18 21:56:52 +00:00
Gregory Montoir
18cab2cc65 added basic support for playing FOTAQ amiga modules files (rjp1) instead of MIDI (code is currently #ifdef'ed out).
svn-id: r25707
2007-02-18 21:46:40 +00:00
Chris Apers
17b14e44c7 Correct warned class name
svn-id: r25694
2007-02-18 18:03:57 +00:00
Max Horn
4db72c8762 Unified how we deal with (and how we generate) MIDI sysex messages -- in particular, we now always do so w/o framing the message (documented this with a Doxygen comment in the MidiDriver class)
svn-id: r25630
2007-02-16 13:30:41 +00:00
Max Horn
8cef52294c Fix for bug #1660559: MANIAC/ZAK: Music does not stop when pausing (regression)
svn-id: r25605
2007-02-15 12:47:09 +00:00
Eugene Sandulenko
0a56c312f1 Fix MSVC warning
svn-id: r25586
2007-02-14 16:45:25 +00:00
Sven Hesse
82e4318b02 Fixed a special case (frequency/rate > repeating sample length)
svn-id: r25521
2007-02-12 12:54:08 +00:00
Travis Howell
028d077e2b Enable stereo by default for all ProTracker mods.
svn-id: r25482
2007-02-11 02:47:02 +00:00
Sven Hesse
023591a77a The status variables are set explicitely in the constructor instead through one memset now, to avoid setting the SoundHandle to 0 as well (the first play() would then stop SoundHandle 0, which doesn't strike me as being correct)
svn-id: r25409
2007-02-07 16:27:43 +00:00
Sven Hesse
0ed752aa6e - Moved the specific interrupt frequency of 80 Hz out of class Infogrames into the GobEngine's Infogrames instances
- Changed the 80 Hz to 75 Hz, which is more true to the original

svn-id: r25389
2007-02-04 15:59:05 +00:00
Max Horn
cb49cbdd45 * Reimplemented Mixer::pauseAll to simply invoke pause on all channels
(implying change of semantics)
* Reordered the params of Mixer::playRaw (the SoundType now comes first, not last)
* Removed Mixer::isPaused
* Removed Mixer::getSoundElapsedTimeOfSoundID
* Added some doxygen comments to the Mixer

svn-id: r25356
2007-02-03 19:05:53 +00:00
Johannes Schickel
46609ad455 formatting.
svn-id: r25230
2007-01-27 22:03:33 +00:00
Sven Hesse
5dab7f823f Implemented some missing effects (arpeggio, sample delay, fine slides, finetune, pattern delay)
svn-id: r25229
2007-01-27 21:55:26 +00:00
Sven Hesse
7d1c2ecbb4 Ooops
svn-id: r25227
2007-01-27 17:53:56 +00:00
Sven Hesse
569136db75 Changed ProtrackerStream to inherit from Paula, unifying the mixing
svn-id: r25226
2007-01-27 17:32:54 +00:00
Travis Howell
20aca1092b Add changes from madmoose to fix initial song length.
svn-id: r25219
2007-01-27 00:33:38 +00:00
Max Horn
8205cd9d3d Removing two FIXMEs, based on what madmoose told me on #scummvm
svn-id: r25216
2007-01-27 00:11:15 +00:00
Max Horn
516cd07d10 Some cleanup / code formatting changes, and added some FIXME comments
svn-id: r25199
2007-01-26 11:47:26 +00:00
Sven Hesse
43fb2e6ed9 Moved Paula and Infogrames to sound/mods/
svn-id: r25191
2007-01-25 15:17:46 +00:00
Neil Millstone
9c12f89fc7 Changed size of sine table so it take less memory in cache RAM on DS port
svn-id: r24800
2006-12-01 22:44:19 +00:00
Torbjörn Andersson
a7950182f5 Changed the default instrument from "no instrument at all" to "the first
instrument in the instrument bank". It looks like Elvira 1 and 2 play music
without selecting any instruments first on some channels. This should fix bug
#1582389.

svn-id: r24657
2006-11-08 18:47:33 +00:00
Gregory Montoir
a8d7265c5e added basic handler for VOC block 9
svn-id: r24590
2006-11-03 21:03:12 +00:00
Max Horn
c718463a24 Added Audio::Mixer::setReady method to work around bug #1588848
svn-id: r24583
2006-11-01 21:28:14 +00:00
Max Horn
71763c3630 Modified version of patch #1584720 (add support for FLAC-1.1.3)
svn-id: r24554
2006-10-28 13:21:43 +00:00
Max Horn
a4a83df8a1 cleanup
svn-id: r24537
2006-10-27 22:47:53 +00:00
Travis Howell
99d6e6db5c Add patch to make ProTracker a subclass of AudioStream, from madmoose
svn-id: r24465
2006-10-23 01:37:59 +00:00
Max Horn
07f7761479 Backend modularization: Create timer manager, savefile manager and audio mixer in the backends for increased flexibility
svn-id: r24443
2006-10-22 15:42:29 +00:00
Max Horn
9edf1e6a1a cleanup
svn-id: r24407
2006-10-21 12:44:10 +00:00
Max Horn
772affc7db Yuck, mark abuse of OSystem::setSoundCallback
svn-id: r24404
2006-10-21 11:14:41 +00:00
Travis Howell
8c72861de4 Add option to load a module via stream
svn-id: r24387
2006-10-19 05:37:22 +00:00
Johannes Schickel
cf60ba63e9 some cleanup.
svn-id: r24374
2006-10-18 18:34:40 +00:00
Eugene Sandulenko
7282e24d3b Add WIP (not yet plugged in) Protracker modules player
svn-id: r24351
2006-10-16 22:20:46 +00:00
John Willis
9aa0984702 Fix GP2X ifdef error in initial patch. Sorry.
svn-id: r24257
2006-10-09 20:38:59 +00:00
Eugene Sandulenko
3d84f11046 Patch #1432376: "Very basic GP2X Backend"
svn-id: r24144
2006-10-06 19:01:39 +00:00
Eugene Sandulenko
8f44098332 Revert part of commit 23552 by agent-q. Apparently this slipped in by
mistake, as DS port sets FMOPL quality in ds/arm9/source/osystem_ds.cpp
void OSystem_DS::initBackend().

svn-id: r24046
2006-09-30 19:33:43 +00:00
Max Horn
4c14cf6d1a Moved base/engine.cpp and .h to engines/ (main motivation: helps untangle the linker dependency graph). Porters will have to update project files
svn-id: r23974
2006-09-23 00:42:35 +00:00
Eugene Sandulenko
4e8df88c81 Fix bug #1501302: "FF: Crackling Audio (Mac version)"
svn-id: r23970
2006-09-21 20:12:16 +00:00
Torbjörn Andersson
15f9a3ce33 Some more whitespace changes.
svn-id: r23655
2006-08-01 14:10:46 +00:00
Torbjörn Andersson
1e9e65d5bc Whitespace.
svn-id: r23654
2006-08-01 14:05:18 +00:00
Johannes Schickel
8d453f2267 Another little formatting and a typo fix.
svn-id: r23621
2006-07-29 23:51:43 +00:00
Johannes Schickel
43fbc9eb81 Adding comment about forced MQ on small devices.
svn-id: r23620
2006-07-29 23:44:09 +00:00
Johannes Schickel
1d52f836dc Some formatting 'fixes'
svn-id: r23619
2006-07-29 23:42:27 +00:00
Torbjörn Andersson
c32076e5d0 Use #include "..." instead of #include <...> for pack-start.h and pack-end.h
for consistency with other #includes.

svn-id: r23585
2006-07-23 16:13:26 +00:00
Max Horn
2859b64702 Fix struct packing issues (macros are not resolve in #pragma params, at least for GCC)
svn-id: r23569
2006-07-22 17:28:48 +00:00
Neil Millstone
42cebc00dc Speed increase for DS port - uses cache ram to store SIN_TABLE. Other versions are unaffected.
svn-id: r23552
2006-07-22 10:56:11 +00:00
Max Horn
f59cf1fcdc Removing GCC_PACK, we fully rely on START_PACK_STRUCTS / END_PACK_STRUCTS now (hiya eriktorbjorn, this one is for you *ggg*)
svn-id: r23547
2006-07-21 21:25:17 +00:00
Oystein Eftevaag
ef42b9962d Spelling and formatting
svn-id: r23542
2006-07-21 10:59:55 +00:00
Torbjörn Andersson
6358547a43 More whitespace changes.
svn-id: r23496
2006-07-14 13:33:58 +00:00
Torbjörn Andersson
612ba0c2be Some whitespace changes to see if the CIA bot is still silent.
svn-id: r23491
2006-07-13 14:01:48 +00:00
Max Horn
f35f4a4d1c Use START_PACK_STRUCTS / END_PACK_STRUCTS when available, instead of checking for GCC / not GCC
svn-id: r23458
2006-07-09 13:01:15 +00:00
Max Horn
bea72e9514 Patch #1519399: DS Backend
svn-id: r23452
2006-07-09 11:47:17 +00:00
Max Horn
75628fe9d7 Renamed class Timer to TimerManager (the old name was somewhat incorrect/confusing)
svn-id: r23278
2006-06-24 09:34:49 +00:00
Max Horn
9a955180a4 * Renamed config.mak to config.mk
* Renamed common.rules to rules.mk
* Removed explicit declaration of MODULE_DIRS in various spots (instead we let rules.mk compute it)

svn-id: r23275
2006-06-24 08:48:11 +00:00
Torbjörn Andersson
ecfedb1e81 Cleanup. It seems unnecessary to have a "break" right after an unconditional
return in a switch case.

svn-id: r23198
2006-06-20 18:55:25 +00:00
Lars Persson
67d58ec4bb Added assert to audiostream allocation since failure causes serious problems
svn-id: r23184
2006-06-19 21:08:34 +00:00