aboutsummaryrefslogtreecommitdiff
path: root/sound/mixer.h
AgeCommit message (Collapse)Author
2003-07-06mix() is really a private method, only to be called by the audio thread; ↵Max Horn
cover setupPremix by the mutex, too (that helps preventing race conditions upon exit) svn-id: r8809
2003-07-06now that we mutex-protect everything properly, we can get rid of ↵Max Horn
_toBeDestroyed; also, instead of keeping a global _handles array in the mixer, let each Channel manage its own handle svn-id: r8808
2003-07-06cleanup to the mixer helper proc interface and to ChannelStreamMax Horn
svn-id: r8785
2003-07-05updated code to use type MutexRef; added class StackLock (from sdl backend, ↵Max Horn
now in util.*) svn-id: r8777
2003-06-22Change names of the stream API in the mixer; added endStream method (stop() ↵Max Horn
halts stream immediately; endStream() lets it first finish playing) svn-id: r8603
2003-06-22renamed SoundMixer::hasActiveChannel->hasActiveSFXChannel, and fixed the ↵Max Horn
regression in it caused by removing _beginSlots (I hope); added isActiveChannel method used by scumm/sound.cpp (this allowed me to move the Channel class from mixer.h into mixer.cpp); replaced Channel::soundFinished method by isActive svn-id: r8597
2003-06-22remove the realDestroy methods and instead use destructors; renamed insertAt ↵Max Horn
to insertChannel and simplified/unified its usage; delete the mutex when exiting; cleanup svn-id: r8596
2003-06-21lots of mixer cleanup / refactoring / reengineeringMax Horn
svn-id: r8594
2003-06-21modified & cleaned up the playStream/append code a bit; but this API really ↵Max Horn
could stand some refinement svn-id: r8592
2003-06-21cleanupMax Horn
svn-id: r8584
2003-06-18Use stdafx.h instead of manually including system headers.Marcus Comstedt
svn-id: r8541
2003-06-15more cleanupMax Horn
svn-id: r8497
2003-05-18HAVE_CONFIG_HJonathan Gray
svn-id: r7632
2003-03-18cleanup; add stopID method to stop a currently playing sound via its IDMax Horn
svn-id: r6835
2003-03-06updated copyrights headersPaweł Kołodziejski
svn-id: r6726
2003-03-06and more cleanup ....Paweł Kołodziejski
svn-id: r6719
2002-12-25fix -pedantic warningsMax Horn
svn-id: r6108
2002-11-10added looping support to playRawOliver Kiehl
svn-id: r5501
2002-10-28Fix using MAD -without- Vorbis, and remove COMPRESSED_SOUND_FILE define.James Brown
Please keep in mind that if you put an 'else' statement in an if clause, keep in mind that if the code it's supposed to 'else' is in another define.... and that isn't set... the NEXT statement of code will be used as the 'if..else' condition. svn-id: r5344
2002-10-27Add monster.sog support, patch #629362Travis Howell
Enable ogg support by default in mingw builds and link in ogg lib svn-id: r5333
2002-10-27patch #628997 support for ogg vorbis instead of cd tracks by Daniel ↵Jonathan Gray
Schepler. Uncomment the relevant lines in the makefile to use svn-id: r5320
2002-10-16compilation fixMax Horn
svn-id: r5158
2002-10-15changes to imusePaweł Kołodziejski
svn-id: r5157
2002-10-15changes to soundmixer - added timeout param to streamPaweł Kołodziejski
svn-id: r5149
2002-10-02added panning control in imuse and reverse stereo supportPaweł Kołodziejski
svn-id: r5076
2002-10-02Fix 'isSoundRunning' for Creative samples (eg, Full Throttle)James Brown
svn-id: r5072
2002-09-14fixed stream in mixer, not completed yet - bad wrap around.Paweł Kołodziejski
svn-id: r4940
2002-09-08rewrote config class; cleanup; code restructuringMax Horn
svn-id: r4903
2002-09-02changed file io in sounds to class FilePaweł Kołodziejski
svn-id: r4896
2002-08-24synced with scummvmPaweł Kołodziejski
svn-id: r4821
2002-08-18move _volume_table creation into constructor, and discard it in destructorMax Horn
svn-id: r4764
2002-08-18MAJOR change to the way how Engine objects are instantiatedMax Horn
svn-id: r4758
2002-08-18pedantic #define rename :-)Max Horn
svn-id: r4755
2002-07-29patch 587769 by Fridvin Logi (supposedly helps with Nexus in The Dig)Max Horn
svn-id: r4678
2002-07-28moved file bundle stuff into class BundlePaweł Kołodziejski
svn-id: r4671
2002-07-21Apply patch from Torbj�rn Andersson to make MP3_CDMUSIC mixer useJames Brown
music_volume instead of sfx_volume. svn-id: r4611
2002-07-07indent runMax Horn
svn-id: r4475
2002-06-03Added the mutex support to ease the streaming (ie to prevent all raceLionel Ulmer
conditions between an 'append' and a playing by the sound thread). Porters should add the relevant stuff to their OSystem interfaces. But finally, the bug reported by Valgrind was much more trivial than that and is also fixed in this commit :-) svn-id: r4398
2002-06-02Fix the streaming used in the movies in TheDig (warning, did not testLionel Ulmer
Full Throttle). This should be less buggy (ie crash less often, maybe not better quality) than the previous code. NOTE: the '1024 *' is here for testing purposes and will need to be severely reduced :-/ svn-id: r4396
2002-05-18Added infrastructure to support more than 8 bit signed / unsigned RAWLionel Ulmer
mixers. Porters, beware, the default configuration is now 16 bit stereo instead of 16 mono as before (I changed X11 and SDL but no others). I did not add support for any other format yet, I will let Endy do it when he needs it :-) svn-id: r4348
2002-05-12added append() stubs for Channel_MP3/Channel_MP3_CDMUSICMax Horn
svn-id: r4296
2002-05-12Add new mixer 'append' function to allow pseudo-streaming for SMUSHJames Brown
svn-id: r4291
2002-05-01Pause and start of volume supportNicolas Bacca
svn-id: r4165
2002-04-29Small inSANE patch for the dig, and start of Dig Audio support.James Brown
It seems to crash using AUTOFREE for some reason. Can someone Valgrind/Purify this for me? svn-id: r4129
2002-04-28MI1 CD audio should work better now. Still a bit flaky but should beLionel Ulmer
better than before :-) svn-id: r4128
2002-04-27MP3 CD tracks should now be working properly.Lionel Ulmer
Ludde, maybe you should check if Simon is still working OK as now the change of the sound playing handle is 'asynchronous' (ie if you call 'stop' on a sound, the handle will NOT be put to NULL right away, but at the next 'mix' thread call). Maybe we should completely remove this handle stuff and always use instead the index returned by the 'play_XXX' functions. svn-id: r4101
2002-04-26Fixed race conditions in the sound code (where a sound could beLionel Ulmer
'freed' while it was mixed at the same time in the sound thread). Now Monkey1 seems to play well with Valgrind without any memory warning. svn-id: r4096
2002-04-22Fix MP3 compilation.James Brown
svn-id: r4050
2002-04-22Add voice channel tracking to stop script race in BumpusVille VR.James Brown
svn-id: r4048
2002-04-21Add boilerplate license to some files, to satisfy Debian types :)James Brown
fmopl.c/fmopl.h are infringing on the GPL at the moment. We either need to replace these, or get permission to relicense them, before 0.2.0 svn-id: r4036