aboutsummaryrefslogtreecommitdiff
path: root/sound/mixer.cpp
AgeCommit message (Collapse)Author
2010-01-20cleanupMax Horn
svn-id: r47406
2010-01-19Get rid of Mixer::playRaw for goodMax Horn
svn-id: r47394
2010-01-19Remove loop start/end params from Mixer::playRaw; convert some code from ↵Max Horn
Mixer::playRaw to Mixer::playInputStream svn-id: r47375
2010-01-19Get rid of Mixer::FLAG_REVERSE_STEREO; also change SCUMM's iMuse Digital ↵Max Horn
emulation to reverse stereo again, as it once seems to have been intended svn-id: r47374
2010-01-19Get rid of Mixer::FLAG_AUTOFREE.Max Horn
Also fix several recently introduced new/delete vs. malloc/free mismatches. svn-id: r47369
2010-01-19Move raw audio streams to new header sound/raw.hMax Horn
svn-id: r47368
2010-01-19Rename 'Linear' audio streams to 'raw'Max Horn
svn-id: r47367
2010-01-09Add Mixer::getElapsedTime() method returning a Timestamp, thus offering a ↵Max Horn
higher precision than Mixer::getSoundElapsedTime(). Convert some video code to use it. svn-id: r47213
2010-01-08Switch Mixer::playInputStream to use DisposeAfterUse::FlagMax Horn
svn-id: r47182
2010-01-08Since AudioStream looping is no longer handled by the Mixer, drop ↵Johannes Schickel
Mixer::playAudioStreamLooping. (There's Audio::makeLoopingAudioStream). svn-id: r47160
2010-01-07Cleanup.Johannes Schickel
svn-id: r47133
2010-01-07Add a playInputStreamLooping for RewindableAudioStream to Mixer.Johannes Schickel
svn-id: r47113
2010-01-07Switch Mixer back to use only one Channel implementation. (partial revert of ↵Johannes Schickel
r47031 + r47034). svn-id: r47110
2010-01-05Properly initialize _pos in LoopingChannel.Johannes Schickel
svn-id: r47055
2010-01-05Cleanup.Johannes Schickel
svn-id: r47052
2010-01-05- Initial implementation of looping of SeekableAudioStreams in Mixer.Johannes Schickel
- Adapted AudioCD code to use this for audio CD emulation. svn-id: r47045
2010-01-05Add some basic documentation to the new Channel interface.Johannes Schickel
svn-id: r47034
2010-01-05- Do not calculate left/right channel volume every SimpleChannel::mix call ↵Johannes Schickel
anymore, but do it once - Notify a channel, when it's channel volume type changed from inside MixerImpl::setVolumeForSoundType svn-id: r47033
2010-01-05Get rid of public variables in Channel.Johannes Schickel
svn-id: r47032
2010-01-05Create a generic Channel interface for the default Mixer implementation.Johannes Schickel
svn-id: r47031
2010-01-05- Fix a bug in Channel::pause for recursive pausing.Johannes Schickel
- Fix bug in Channel:getElapsedTime, when called while the channel is paused. svn-id: r47029
2010-01-05Use the return value of RateConverter::flow to calculate the decoded samples ↵Johannes Schickel
and not the upper bound "len". (This should only be a difference when the audio stream has no more samples left) svn-id: r47015
2010-01-04Switch Channel::getElapsedTime() to use a Timestamp for its computationsMax Horn
svn-id: r46995
2009-01-03Removed a (hopefully) obsolete FIXME comment.Torbjörn Andersson
svn-id: r35690
2008-12-22Fixed indentation and removed whitespaces at the end of lineJordi Vilalta Prat
svn-id: r35481
2008-11-09Made getSoundElapseTime() work better when the sound has been paused. A newTorbjörn Andersson
variable, _pauseTime, keeps track of how long the sound has been paused since the last mixer time stamp. svn-id: r34955
2008-09-05Removed useless dependencies from common/file.h in common code. When ↵Nicola Mettifogo
complete removal was not possibile, dependency has been pushed to the cpp files from the headers. svn-id: r34343
2008-06-28Patch ##1956946 (Audio::Mixer internal API revision) with some tweaksMax Horn
svn-id: r32828
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