aboutsummaryrefslogtreecommitdiff
path: root/sound/audiocd.cpp
AgeCommit message (Collapse)Author
2010-08-04AUDIO: Implement volume and balance control for the AudioCD manager (needed ↵Florian Kagerer
for music fading in Kyra 1 FM-Towns and probably other FM-Towns games). This addition applies to emulated CD audio only for now. I haven't found a way to implement this for real CDs yet. SDL doesn't seem to support this (but it might be just me? If anyone knows more about this, just tell me). svn-id: r51741
2010-04-12AUDIO: Rename Mixer::playInputStream to playStreamMax Horn
svn-id: r48637
2010-03-13Fix our DECLARE_SINGLETON macro to conform to the C++ specs.Johannes Schickel
We need to use a namespace Common { } there to make strict C++ compilers like clang++ and comeau happy. I also added a slight comment about why that is needed to the macro definition and a note that you need to use it from the global namespace. svn-id: r48254
2010-01-26Moved audio stream implementations (for MP3, FLAC, etc.) to new dir ↵Max Horn
sound/decoders/ svn-id: r47579
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: r47112
2010-01-07First step of a slight revision of the new AudioStream looping API:Johannes Schickel
- Create a RewinadableAudioStream, for streams which can only be reset to the start - Create a LoopableAudioStream, which loops a whole RewindableAudioStream - Make SeekableAudioStream a subclass of RewindableAudioStream - Create a SubSeekableAudioStream, which allows of limiting the range of an SeekableAudioStream to be played. - Adapt AudioCD code. svn-id: r47109
2010-01-06- Move openStreamFile from AudioStream to SeekableAudioStream.Johannes Schickel
- Fix documentation of openStreamFile. svn-id: r47080
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
2009-01-24fixing #2531282: don't fall back to a real audio CD when playing enhanced ↵Willem Jan Palenstijn
midi tracks svn-id: r36030
2009-01-24remove 'HACK': don't use _cd.playing to indicate emulationWillem Jan Palenstijn
svn-id: r36029
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
2007-09-19Merged common/stdafx.h into common/scummsys.h. All referencing files have ↵Nicola Mettifogo
been updated. svn-id: r28966
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-05-27Reverted r26922.Johannes Schickel
svn-id: r26967
2007-05-22Simpilified Singleton implementation and usage.Johannes Schickel
svn-id: r26922
2007-04-14Rewrote AudioCDManager to not use DigitalTrackInfo instances anymore, but ↵Max Horn
rather create/use track AudioStream instances directly svn-id: r26476
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-24Added numLoops parameter to DigitalTrackInfo::playMax Horn
svn-id: r25836
2007-02-20Cleaned up AudioCDManager::getCachedTrack (in particular, don't empty a slot ↵Max Horn
in the track cache if we are not going to use it) svn-id: r25740
2007-02-19So far we only accepted track1.* as name for audio tracks -- now we also ↵Max Horn
accept track01.* (we still only document the former naming scheme, intentionally) svn-id: r25728
2007-02-07The status variables are set explicitely in the constructor instead through ↵Sven Hesse
one memset now, to avoid setting the SoundHandle to 0 as well (the first play() would then stop SoundHandle 0, which doesn't strike me as being correct) svn-id: r25409
2006-10-21cleanupMax Horn
svn-id: r24407
2006-09-23Moved base/engine.cpp and .h to engines/ (main motivation: helps untangle ↵Max Horn
the linker dependency graph). Porters will have to update project files svn-id: r23974
2006-05-09- Updated MSVC8 project filesEugene Sandulenko
- Renamed base/options.cpp to base/commandLine.cpp because of conflict with gui/options.cpp which sit in same directory in MSVC builds - Moved AudioCDManager singleton declaration outside of Audio namespace - Fixed numerous MSVC warning of potentially uninitialized variables and int <-> bool conversions. svn-id: r22397
2006-04-29Moved the AudioCDManager as well as class AudioStream and its (standard) ↵Max Horn
subclasses to namespace Audio svn-id: r22231
2006-03-03It's really 'MPEG', not 'Mpeg'Max Horn
svn-id: r21042
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-08-10Don't explicity check for tremor and vorbis everywhere andJonathan Gray
require both USE_TREMOR and USE_VORBIS to be defined when using tremor. svn-id: r18642
2005-08-10Rest of the changes required for tremor to actually work.Jonathan Gray
Based on patches against 0.7.1 by Jolan Luff. svn-id: r18641
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-04-20code conventionsGregory Montoir
svn-id: r17714
2005-04-20this should fix bug #1181979Gregory Montoir
svn-id: r17713
2005-04-13Only cache a track if it really exists, this should prevent some issues when ↵Gregory Montoir
playing with invalid compressed tracks. See also bug report #1181979. svn-id: r17591
2005-03-12PlayingSoundHandle -> SoundHandle; also, turned the handle activity check ↵Max Horn
into a mixer method svn-id: r17106
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-01Updated copyrightMax Horn
svn-id: r16398
2004-12-28Fix running ScummVM in plugin-modeMax Horn
svn-id: r16360
2004-09-28Rename remaining OSystem methods to match our coding guidelinesMax Horn
svn-id: r15332
2004-04-26Tweaked a few things to accommodateJamieson Christian
MSVC6's idiosyncracies. svn-id: r13644
2004-02-22Patch #885904 (Flac Support) with some tweaks by meMax Horn
svn-id: r12984
2004-01-06updated copyright noticeMax Horn
svn-id: r12176
2004-01-04no need to specify game data path here: File::setDefaultDirectory() took ↵Max Horn
care of that svn-id: r12135
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
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-12init some more member varsMax Horn
svn-id: r11597
2003-12-11Emergency bugfixes:Torbjörn Andersson
Initialise _cd.playing to false. Otherwise ScummVM may create a savegame where a CD track appears to be playing, but everything about it is undefined, causing ScummVM to crash when loading it. Initialise _track_info[] with NULLs, otherwise ScummVM crashes for me when I start the CD version of MI1. There's probably a lot more that *should* be properly initialised, but this seems to take care of the most serious issues, and is all I have the time to do now anyway. svn-id: r11573
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 01:16:34 +0000