aboutsummaryrefslogtreecommitdiff
path: root/sound/mixer.cpp
AgeCommit message (Collapse)Author
2007-09-19Merged common/stdafx.h into common/scummsys.h. All referencing files have ↵Nicola Mettifogo
been updated. svn-id: r28966
2007-07-22Don't be so strict about un-pausing sounds which are not paused currentlyMax Horn
svn-id: r28163
2007-06-30Changed semantics of Mixer::pause*() methods -- if you pause n times, you ↵Max Horn
have to unpause n times before the sound resumes (this means pauseAll works correct in engines which selectively pause/resume single sounds) svn-id: r27798
2007-06-03Removed dead codeMax Horn
svn-id: r27066
2007-05-30Updated legal headers in source files, based on what Pidgin (the IM client ↵Max Horn
formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots svn-id: r27024
2007-03-10More fixes for MSVC8 warnings.Eugene Sandulenko
svn-id: r26063
2007-03-02Changed the order of the parameters of makeLinearInputStream to resemble ↵Max Horn
Mixer::playRaw; also made makeLinearInputStream honor FLAG_LOOP (and for this, changed its loop related params slightly) svn-id: r25926
2007-03-02Added reverseStereo parameter to Mixer::playInputStream; changed ↵Max Horn
Mixer::playRaw to use Mixer::playInputStream svn-id: r25923
2007-02-24Remove unneeded #includesMax Horn
svn-id: r25838
2007-02-20Patch #1663933 (Kill premix channel) with a few tiny additional tweaks by meMax Horn
svn-id: r25752
2007-02-15Fix for bug #1660559: MANIAC/ZAK: Music does not stop when pausing (regression)Max Horn
svn-id: r25605
2007-02-03* Reimplemented Mixer::pauseAll to simply invoke pause on all channelsMax Horn
(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
2006-10-22Backend modularization: Create timer manager, savefile manager and audio ↵Max Horn
mixer in the backends for increased flexibility svn-id: r24443
2006-04-02With this change, backends are now responsible for instantiating their ↵Max Horn
OSystem class before calling scummvm_main (Note: PalmOS and Symbian are not yet converted, and won't work currently) svn-id: r21557
2006-02-11Change CVS keywords to SVN keywordsMax Horn
svn-id: r20515
2006-01-18Update copyright noticeEugene Sandulenko
svn-id: r20088
2005-10-18Update FSF address. Eek. Actually that took place on May 1, 2005Eugene Sandulenko
svn-id: r19142
2005-07-30Remove trailing whitespaces.Eugene Sandulenko
svn-id: r18604
2005-06-24When including files from common/, explicitly use the common/ prefixMax Horn
svn-id: r18444
2005-05-10Moved class SoundMixer to Audio::Mixer (didn't call the namespace 'Sound' ↵Max Horn
because we already have many classes with that name) svn-id: r18039
2005-05-08Comply to our coding conventionsMax Horn
svn-id: r17975
2005-04-04Renamed getActiveChannelSoundID to getSoundID and fixed its semantics to ↵Max Horn
avoid race conditions svn-id: r17377
2005-04-04Add 8 sound channel support for HE gamesTravis Howell
-Allows sound looping to work Added support for WAVE format musuc used in later HE100 games. svn-id: r17372
2005-03-23To prevent race conditions, SoundMixer::isSoundHandleActive must lock the ↵Max Horn
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-22Make sure SoundHandle's are initedMax Horn
svn-id: r17194
2005-03-12Simplified SoundHandle implementationMax Horn
svn-id: r17107
2005-03-12PlayingSoundHandle -> SoundHandle; also, turned the handle activity check ↵Max Horn
into a mixer method svn-id: r17106
2005-02-06It's kMaxMixerVolume, not 256 (we might change it to 255 eventually)Max Horn
svn-id: r16747
2005-01-30Check sound queue for music in HE games.Travis Howell
Avoid extra sound channel. svn-id: r16706
2005-01-28Use class Mutex instead of MutexRefMax Horn
svn-id: r16679
2005-01-10system.h was being included in tons of places, without any good reason; ↵Max Horn
reduced this (total dependencies on system.h went down from 193 to 85 files) svn-id: r16527
2005-01-01Changed OSystem::instance() to return a reference, not a pointer (it now ↵Max Horn
matches the Singleton interface) svn-id: r16402
2005-01-01Updated copyrightMax Horn
svn-id: r16398
2004-12-28Fixing hasActiveChannelOfTypeMax Horn
svn-id: r16354
2004-12-27Introduced two new constants SoundMixer::kMaxChannelVolume and ↵Max Horn
SoundMixer::kMaxMixerVolume, for clarity svn-id: r16348
2004-12-27Allow premix channels to use a custom sound typeMax Horn
svn-id: r16332
2004-12-27Added 'sound types' to the mixer - for now, only plain (for the premixer), ↵Max Horn
SFX and music; volume is now controlled based on the sound type svn-id: r16330
2004-11-28Changed parameter order of SoundMixer::playInputStream to match that of playRawMax Horn
svn-id: r15950
2004-11-28Added a "permanent" field to Channels, which simply prevents them from being ↵Jerome Fisher
deleted during stopAll(). I hope this doesn't step on anyone's toes; it was quite urgent, since loading a saved game stopped MT-32 emulation audio forever. svn-id: r15946
2004-11-28Assume for now that the premixer is always used for music playback (as ↵Max Horn
opposed to being used for SFX); this affects the volume (see bug #1049375) svn-id: r15940
2004-11-27Removed the (highly SCUMM specific) 'appendable stream' API from SoundMixer; ↵Max Horn
SCUMM now uses the appendable stream directly svn-id: r15919
2004-11-27Removed the old setupPremix version, it is not needed anymore. Also fixed ↵Max Horn
some doxygen comments (they were being assigned to the wrong things) svn-id: r15918
2004-11-27Added some more mixer doxygen docs; cleaned up Mixer API a bit, removing ↵Max Horn
some very specialised methods svn-id: r15914
2004-11-27AudioStream::read() has been removed quite some time ago, now making sure ↵Max Horn
that change is reflected everywhere svn-id: r15911
2004-10-11Implement premix proc via an AudioStream / Channel (eventually we'll remove ↵Max Horn
the setupPremix method which takes a proc pointer) svn-id: r15522
2004-09-28Rename remaining OSystem methods to match our coding guidelinesMax Horn
svn-id: r15332
2004-09-19Fix potential race conditionMax Horn
svn-id: r15191
2004-09-19Actually check if a sound is active, if the sound is outside music engine.Travis Howell
Add some more HE differences svn-id: r15188
2004-09-18smush tracks are not music channel, removed outdated dimuse commentPaweł Kołodziejski
svn-id: r15167
2004-09-04fixde bug IMUSE+DEBUGPaweł Kołodziejski
svn-id: r14892