aboutsummaryrefslogtreecommitdiff
path: root/sound/mixer.cpp
AgeCommit message (Collapse)Author
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
2004-07-16Applied patch #957544 to make output sample rate configurable at runtime.Torbjörn Andersson
svn-id: r14225
2004-02-28renamed more OSystem methods to follow our naming scheme; renamed ↵Max Horn
NewGuiColor to OverlayColor; fixed some calls to error() in the SDL backend svn-id: r13087
2004-02-24the OSystem changes we discussed on the ML (note: renaming of the existing ↵Max Horn
OSystem API is not yet finished); porters will have to fix their ports to get them to compile again svn-id: r13036
2004-02-22Patch #885904 (Flac Support) with some tweaks by meMax Horn
svn-id: r12984
2004-02-12With no comments from fingolfin, and a go-ahead from ender, I've committedTorbjörn Andersson
patch #892455 ("getElapsedTime() for sounds") despite its current shortcomings. It should be good enough for the Broken Sword cutscenes anyway, which is what I'll be looking at next. svn-id: r12829
2004-01-29Renamed the 'pan' effect of the mixer to 'balance', since that is what we ↵Max Horn
actually do; applied patch #886786 which corrects a bug in the balance code svn-id: r12665
2004-01-20No more neededChris Apers
svn-id: r12559
2004-01-06updated copyright noticeMax Horn
svn-id: r12176
2004-01-03renamed AudioInputStream -> AudioStreamMax Horn
svn-id: r12110
2004-01-03more MAD MP3 / Ogg Vorbis cleanup: try not to expose anything about the libs ↵Max Horn
used for MP3/Vorbis support -> this eases changing the implementations, and reduces header dependencies (and thus compile time) :-) svn-id: r12097
2004-01-03removed SoundMixer::playMP3CDTrack; simplified makeMP3Stream (special ↵Max Horn
variant with mad_timer_t was really only needed for MP3TrackInfo class) svn-id: r12095
2003-12-27paranoiaMax Horn
svn-id: r11980
2003-12-26add param to playInputStream which makes it possible to retain an input ↵Max Horn
stream even after it has been given to the mixer for playback svn-id: r11933
2003-12-26logic fix: we must do wrap around *before* read, not after. otherwise ↵Max Horn
eosIntern will in some border cases return wrong results; some cleanup svn-id: r11932
2003-12-24o Added SoundMixer::isReady()Max Horn
o Removed SoundMixer::bindToSystem() o In scumm, replaced _silentMixer, _silentDigitalImuse and _noDigitalSamples by SoundMixer::isReady() svn-id: r11893
2003-12-24turned PlayingSoundHandle into an 'opaque' (well not really :-) data type, ↵Max Horn
mainly because people kept (accidentally and sometimes on purpose :-) misusing them svn-id: r11881
2003-12-23Allow sound ID for MP3/Vorbis sounds, too; cleaned up Vorbis playback code a bitMax Horn
svn-id: r11879
2003-12-22Fix warning generated by the incomprehensibly picky MinGW GCC compiler.Torbjörn Andersson
svn-id: r11858
2003-12-22o Got rid of Channel::destroy() method (no more evil 'delete this', plusMax Horn
slightly more efficient) o Fixed potential memory leak in SoundMixer::playRaw o Channel not anymore friend class of SoundMixer o misc cleanup svn-id: r11857
2003-12-21added convenience SoundMixer::playVorbis variant which calls through to ↵Max Horn
playSfxSound_Vorbis; made scumm/queen engines use it svn-id: r11812
2003-12-21Cleaned up SoundMixer::newStream() a bit (I plan to replace all usages of ↵Max Horn
this by playInputStream(), this cleanup eases this a bit) svn-id: r11803
2003-12-21o Make use of the new LinearMemoryStream feature which allows auto-disposing ↵Max Horn
the sound data o This allows us to get rid of the ChannelRaw class o Removed the sound index return value from several methods o Removed all methods dealing with sound indices (i.e. stopChannel and pauseChannel) svn-id: r11801
2003-12-19distinguish between end of stream and end of dataMax Horn
svn-id: r11756