aboutsummaryrefslogtreecommitdiff
path: root/scumm/sound.h
AgeCommit message (Collapse)Author
2004-04-16Fixed illegal access to protected/private member on PalmOS (??)Chris Apers
svn-id: r13588
2004-04-10Cleanup Sound constructor; change search order of SFX filesMax Horn
svn-id: r13527
2004-02-22Patch #885904 (Flac Support) with some tweaks by meMax Horn
svn-id: r12984
2004-01-08unify _vm / _scumm usageMax Horn
svn-id: r12262
2004-01-06updated copyright noticeMax Horn
svn-id: r12176
2003-12-26when introducing a constant used throughout multiple files, best assign a ↵Max Horn
*name* to it, else you're digging your own grave on the long run :-) svn-id: r11941
2003-12-25cleanup; fix File::open usage (do not hardocde constant values, rather use ↵Max Horn
the symbolic namescvs diff | bbeditcvs diff | bbedit svn-id: r11911
2003-12-23Replace the DOTT/SAM hack (which ensures that only one SFX is being played ↵Max Horn
at a time for them) with proper code: instead of hacking the sound handle, we assign a fake sound ID to the SFX, thus ensuring only one is playing at a time svn-id: r11880
2003-12-23cleanupMax Horn
svn-id: r11865
2003-12-22Moved bundle music code from class Sound to IMuseDigital (seems more ↵Max Horn
natural; and allows for various cleanup) svn-id: r11846
2003-11-29moved Audio CD (emulation) code from scumm/sound.cpp to sound/, so that it ↵Max Horn
may be reused by other engines in the future svn-id: r11421
2003-11-12changed getting position of bundle song to msPaweł Kołodziejski
svn-id: r11265
2003-11-11made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced ↵Max Horn
Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup svn-id: r11257
2003-10-17cleanupMax Horn
svn-id: r10874
2003-10-17proper fix for COMI timer issue: don't let a Timer remove itselfMax Horn
svn-id: r10867
2003-10-03introduced namespace Scumm; made #include statements use scumm/ prefix ↵Max Horn
explicitly svn-id: r10571
2003-10-02renamed class Scumm to ScummEngine (consisten with other engine names; also ↵Max Horn
makes room for a potential 'Scumm' namespace) svn-id: r10549
2003-09-15cleanupMax Horn
svn-id: r10260
2003-09-07removed the seperate 'MP3' CD methods in class Sound (besides being ↵Max Horn
misnamed, merging them into their parent functions actually seems clearer to me, reading wise) svn-id: r10071
2003-09-07cleanup/refactoringMax Horn
svn-id: r10070
2003-09-07some cleanup; clarified isSoundInUse semantics and the difference between ↵Max Horn
IMuse::get_sound_active and IMuse::getSoundStatus; added lots of const qualifiers to IMuse; rewrote IMuseInternal::getSoundStatus (hopefully not breaking it); added MusicEngine::getSoundStatus svn-id: r10069
2003-09-01added sound handle stuff to mixer streamsPaweł Kołodziejski
svn-id: r9956
2003-08-01#include cleanup (explicityl specify the location for headers from common/, ↵Max Horn
so that we at some point can get rid of -Icommon; exception is made for stdafx.h, since a) we might want to rename it and b) might want to move it to the top level) svn-id: r9359
2003-07-31revamped MP3/Vorbis CD 'emulation' code to use a PlayingSoundHandle -> this ↵Max Horn
allows to finally get rid of the hackish isChannelActive/isChannelUsed methods in SoundMixer svn-id: r9346
2003-07-29cleanupMax Horn
svn-id: r9281
2003-07-22so it's not the endFrame, but the duration (in frames), after all! grmbl, ↵Max Horn
took me long enough to figure this out, now I can fix up system.h, and then decide whom I can blame for this mess (yeah I know I renamed everything to endFrame in here, but it was named incorrectly in many other places already... ah well, at least now we know :-) svn-id: r9130
2003-07-14fix for bug #769744 (COMI: Trying to append to a nonexistant stream)Max Horn
svn-id: r9025
2003-06-30partially implemented the Audio CD query opcode in Zak256 (see bug #762589); ↵Max Horn
cleanup svn-id: r8680
2003-06-30Fixes as per bug #762593 (Zak256 Audio CD handling); some cleanup (e.g. ↵Max Horn
renamed start/delay -> startFrame/endFrame) svn-id: r8679
2003-06-26fixed memory leak when restartingMax Horn
svn-id: r8661
2003-06-25more const qualifiersMax Horn
svn-id: r8649
2003-06-25added some const qualifiers; moved _bundle & _current_cd_sound from class ↵Max Horn
Scumm to class Sound; some other tweaks svn-id: r8648
2003-06-23this should prevent changing music in some room in the DIGPaweł Kołodziejski
svn-id: r8641
2003-06-15more cleanupMax Horn
svn-id: r8497
2003-06-15made stuff in class Sound protected where possible; moved ↵Max Horn
readCreativeVocFile to imuse_digi.cpp and turned it into a static function; put the DigitalTrackInfo stuff into sound.cpp (keeping it private); removed #includes from sound.h (this cuts down interdependencies a little) svn-id: r8493
2003-05-21many pedantic warning fixes (and some actual potential buglets fixed, too)Max Horn
svn-id: r7795
2003-05-01various music related changes and cleanup; also modified MonkeyVGA music ↵Max Horn
sync, at least the intro is much better synced now; not sure about other parts of it / other games svn-id: r7237
2003-03-06updated copyrights headersPaweł Kołodziejski
svn-id: r6726
2003-03-06and more cleanupPaweł Kołodziejski
svn-id: r6718
2003-01-26added "implementation" of imGetMusicPositionPaweł Kołodziejski
svn-id: r6550
2003-01-20patch #670660 by Daniel Schepler, properly handle disc switching wrt voice ↵Jonathan Gray
file in comi svn-id: r6522
2003-01-12Make things compile :)James Brown
svn-id: r6435
2002-12-29fixed play CMI musicPaweł Kołodziejski
svn-id: r6246
2002-12-28added more stuff for CMI musicPaweł Kołodziejski
svn-id: r6241
2002-12-25converted heaps of int16 to int for V8 compatibility; fixed defineArray for ↵Max Horn
V8; added some work in o8_kludge2 svn-id: r6132
2002-12-25fix -pedantic warningsMax Horn
svn-id: r6108
2002-12-05Fixed inappropriate expiration of sound resources,Jamieson Christian
which fixes concurrency issues esp. in PocketPC and MorphOS. Stubbed SysEx command 2 (start of song) to get rid of annoying warning. Changed MT-32 instrument warnings to fit on one (80-char) line. svn-id: r5842
2002-11-05fix for bug #633082; added some asserts to catch similiar problems in the futureMax Horn
svn-id: r5420
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