aboutsummaryrefslogtreecommitdiff
path: root/engines/sword2/music.cpp
AgeCommit message (Collapse)Author
2012-03-11COMMON: Rename SafeSubReadStream to SafeSeekableSubReadStream.Johannes Schickel
It actually inherits from SeekableSubReadStream, so it should be named accordingly.
2012-02-15JANITORIAL: Fix missing whitespace in pointer castTarek Soliman
find -name '*.h' -or -name '*.cpp' | xargs sed -r -i 's@\(([A-Za-z0-9]+)\*\)@(\1 *)@g' This seems to have caught some params as well which is not undesirable IMO. It also caught some strings containing this which is undesirable so I excluded them manually. (engines/sci/engine/kernel_tables.h)
2011-08-24AUDIO: Remove default rate parameter from xaMatthew Hoops
2011-08-24AUDIO: Rename Vag to XAMatthew Hoops
Vag is really an XA container, and one that we do not have a decoder for (nor need)
2011-05-12GIT: Clean up: Suppress SVN tags, now uselessstrangerke
2011-05-06SWORD2: Replace SafeSubReadStream with the same-name class in CommonSven Hesse
2011-04-28JANITORIAL: Reduce header dependencies in shared codeOri Avtalion
Some backends may break as I only compiled SDL
2011-02-09AUDIO: Rename sound/ dir to audio/Max Horn
svn-id: r55850
2010-11-19COMMON: Split common/stream.h into several headersMax Horn
svn-id: r54385
2010-10-15SWORD2: Fix some code analysis warnings (bug #3087857)Torbjörn Andersson
svn-id: r53467
2010-07-16Cleanup.Torbjörn Andersson
svn-id: r50923
2010-04-17Fix warnings when FLAC&MP3&VORBIS is disabled; also fixes leak in TinselMax Horn
svn-id: r48696
2010-04-12AUDIO: Rename Mixer::playInputStream to playStreamMax Horn
svn-id: r48637
2010-02-03Yet more Flac -> FLAC changes for consistency.Johannes Schickel
svn-id: r47847
2010-02-03- Rename FlacStream to FLACStream.Johannes Schickel
- Rename makeFlacStream to makeFLACStream. svn-id: r47846
2010-01-28Hide VagStream implementation, only expose it via a factory methodMax Horn
svn-id: r47634
2010-01-26Moved audio stream implementations (for MP3, FLAC, etc.) to new dir ↵Max Horn
sound/decoders/ svn-id: r47579
2010-01-16Switch most AudioStream factories to use DisposeAfterUse::FlagMax Horn
svn-id: r47334
2010-01-08Move DisposeAfterUse::Flag from Common to global namespace, and into a new ↵Max Horn
header common/types.h svn-id: r47180
2009-10-18Introduced new type Common::DisposeAfterUse::FlagMax Horn
svn-id: r45233
2009-05-24Strip trailing whitespaces in the whole code base.Johannes Schickel
svn-id: r40867
2009-04-07Sword2: PSX version support, and GMM loading/savingFabio Battaglia
svn-id: r39896
2009-03-07Added comment about a possible FIXME.Torbjörn Andersson
svn-id: r39207
2009-02-20Since opening a compressed piece of music should no longer be an expensiveTorbjörn Andersson
operation, we can probably keep the mutex locked throughout the entire streamCompMusic() function. I'm not convinced that it was ever safe to unlock and relock it partway through. In fact, that's my prime suspect for bug #2614306 ("BS2: noise in music or speech"). svn-id: r38638
2009-02-20Instead of reading an entire compressed sound into a memory stream, use aTorbjörn Andersson
slightly extended SeekableSubReadStream to stream the sound from a file instead. This change is experimental, so it should almost certainly not go into 0.13. svn-id: r38637
2008-07-18Don't crash if you try to use music file #2 as music file #1. When the musicTorbjörn Andersson
wasn't found, it would close the file even if something else was already playing from it. (Some music is in both files.) svn-id: r33094
2008-02-05I think this is slightly easier to read...Torbjörn Andersson
svn-id: r30803
2007-09-19Merged common/stdafx.h into common/scummsys.h. All referencing files have ↵Nicola Mettifogo
been updated. svn-id: r28966
2007-07-21The mixer no longer allows unpausing channels that aren't paused. So don't.Torbjörn Andersson
svn-id: r28155
2007-07-15Fixed sound factory messup caused by my previous commitMax Horn
svn-id: r28111
2007-05-31Re-added Revolution Software copyright to BS2 engineMax Horn
svn-id: r27030
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-18Fixed bug that caused the music to stop. I don't know if this is a regression,Torbjörn Andersson
or it if was just luck that it worked before. svn-id: r26196
2007-03-01Get rid of the last two usages of File::incRef/decRefMax Horn
svn-id: r25919
2007-02-24Trying to unify the order in which we try the various audio formats: Prefer ↵Max Horn
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-17Removed some dead code, updated a warning messageMax Horn
svn-id: r25662
2007-02-08Instead of pre-rendering all subtitles and pre-loading all sounds for a movieTorbjörn Andersson
cutscene, render the text and play the speech when needed. It probably won't play as nicely from CD now, but using less memory seems more important to me. svn-id: r25428
2006-04-29Moved the AudioCDManager as well as class AudioStream and its (standard) ↵Max Horn
subclasses to namespace Audio svn-id: r22231
2006-02-17Removed includes from sword2.h so that (hopefully) there will eventually beTorbjörn Andersson
less dependencies. svn-id: r20741
2006-02-11Moved engines to the new engines/ directoryMax Horn
svn-id: r20582