ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,188 Commits 45 Branches 139 Tags
fc94562c771a528ba6be57504c9bc097cac9d426
Commit Graph
54 Commits
Author SHA1 Message Date
Florian Kagerer e5ffc7847c AUDIO: Implement volume and balance control for the AudioCD manager (needed 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-08-04 16:53:09 +00:00
Max Horn a1840bd573 AUDIO: Rename Mixer::playInputStream to playStream 
svn-id: r48637
 2010-04-12 09:14:17 +00:00
Johannes Schickel 40562798d6 Fix our DECLARE_SINGLETON macro to conform to the C++ specs. 
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-03-13 21:55:49 +00:00
Max Horn 1565f14bc1 Moved audio stream implementations (for MP3, FLAC, etc.) to new dir sound/decoders/ 
svn-id: r47579
 2010-01-26 22:48:45 +00:00
Johannes Schickel 616e4626f5 Since AudioStream looping is no longer handled by the Mixer, drop Mixer::playAudioStreamLooping. (There's Audio::makeLoopingAudioStream). 
svn-id: r47160
 2010-01-08 16:27:29 +00:00
Johannes Schickel e00f36f9c7 Cleanup. 
svn-id: r47112
 2010-01-07 14:22:57 +00:00
Johannes Schickel aa92e004f5 First step of a slight revision of the new AudioStream looping API: 
- 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-07 14:20:36 +00:00
Johannes Schickel 84f3034406 - Move openStreamFile from AudioStream to SeekableAudioStream. 
- Fix documentation of openStreamFile.

svn-id: r47080
 2010-01-06 15:23:33 +00:00
Johannes Schickel caa3db4659 - Initial implementation of looping of SeekableAudioStreams in Mixer. 
- Adapted AudioCD code to use this for audio CD emulation.

svn-id: r47045
 2010-01-05 21:10:34 +00:00
Willem Jan Palenstijn a8ae95cc10 fixing #2531282: don't fall back to a real audio CD when playing enhanced midi tracks 
svn-id: r36030
 2009-01-24 01:29:52 +00:00
Willem Jan Palenstijn de341291aa remove 'HACK': don't use _cd.playing to indicate emulation 
svn-id: r36029
 2009-01-24 01:23:04 +00:00
Nicola Mettifogo 12106a1599 Removed useless dependencies from common/file.h in common code. When complete removal was not possibile, dependency has been pushed to the cpp files from the headers. 
svn-id: r34343
 2008-09-05 11:41:39 +00:00
Nicola Mettifogo 258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated. 
svn-id: r28966
 2007-09-19 08:40:12 +00:00
Max Horn 218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots 
svn-id: r27024
 2007-05-30 21:56:52 +00:00
Johannes Schickel 86104e0bf0 Reverted r26922. 
svn-id: r26967
 2007-05-27 11:40:03 +00:00
Johannes Schickel 8ff17142c5 Simpilified Singleton implementation and usage. 
svn-id: r26922
 2007-05-22 14:17:44 +00:00
Max Horn adb0f89ae3 Rewrote AudioCDManager to not use DigitalTrackInfo instances anymore, but rather create/use track AudioStream instances directly 
svn-id: r26476
 2007-04-14 18:48:09 +00:00
Max Horn b3931a847d Trying to unify the order in which we try the various audio formats: Prefer 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-24 23:40:28 +00:00
Max Horn 65b30d84a8 Added numLoops parameter to DigitalTrackInfo::play 
svn-id: r25836
 2007-02-24 23:19:53 +00:00
Max Horn b162e0dc04 Cleaned up AudioCDManager::getCachedTrack (in particular, don't empty a slot in the track cache if we are not going to use it) 
svn-id: r25740
 2007-02-20 13:50:20 +00:00
Max Horn 0b2602e424 So far we only accepted track1.* as name for audio tracks -- now we also accept track01.* (we still only document the former naming scheme, intentionally) 
svn-id: r25728
 2007-02-19 18:17:38 +00:00
Sven Hesse 023591a77a The status variables are set explicitely in the constructor instead through 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
 2007-02-07 16:27:43 +00:00
Max Horn 9edf1e6a1a cleanup 
svn-id: r24407
 2006-10-21 12:44:10 +00:00
Max Horn 4c14cf6d1a Moved base/engine.cpp and .h to engines/ (main motivation: helps untangle the linker dependency graph). Porters will have to update project files 
svn-id: r23974
 2006-09-23 00:42:35 +00:00
Eugene Sandulenko d2546e3979 - Updated MSVC8 project files 
- 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-05-09 14:16:43 +00:00
Max Horn 27307acd7c Moved the AudioCDManager as well as class AudioStream and its (standard) subclasses to namespace Audio 
svn-id: r22231
 2006-04-29 22:33:31 +00:00
Max Horn 5833b3b0aa It's really 'MPEG', not 'Mpeg' 
svn-id: r21042
 2006-03-03 15:46:39 +00:00
Max Horn 406703148f Change CVS keywords to SVN keywords 
svn-id: r20515
 2006-02-11 10:05:31 +00:00
Eugene Sandulenko ea42bad781 Update copyright notice 
svn-id: r20088
 2006-01-18 17:39:49 +00:00
Eugene Sandulenko b36677af71 Update FSF address. Eek. Actually that took place on May 1, 2005 
svn-id: r19142
 2005-10-18 01:30:26 +00:00
Jonathan Gray 603a5e4d6f Don't explicity check for tremor and vorbis everywhere and 
require both USE_TREMOR and USE_VORBIS to be defined when
using tremor.

svn-id: r18642
 2005-08-10 12:42:56 +00:00
Jonathan Gray 3c1b5648ae Rest of the changes required for tremor to actually work. 
Based on patches against 0.7.1 by Jolan Luff.

svn-id: r18641
 2005-08-10 06:16:26 +00:00
Eugene Sandulenko 6b4484472b Remove trailing whitespaces. 
svn-id: r18604
 2005-07-30 21:11:48 +00:00
Max Horn 8b1d7b9166 When including files from common/, explicitly use the common/ prefix 
svn-id: r18444
 2005-06-24 15:23:51 +00:00
Gregory Montoir 8b559ff875 code conventions 
svn-id: r17714
 2005-04-20 11:13:56 +00:00
Gregory Montoir 5a930d8fe7 this should fix bug #1181979 
svn-id: r17713
 2005-04-20 11:03:36 +00:00
Gregory Montoir 0f3ab2206a Only cache a track if it really exists, this should prevent some issues when playing with invalid compressed tracks. See also bug report #1181979. 
svn-id: r17591
 2005-04-13 19:50:58 +00:00
Max Horn 7cd2cb2b17 PlayingSoundHandle -> SoundHandle; also, turned the handle activity check into a mixer method 
svn-id: r17106
 2005-03-12 18:56:09 +00:00
Max Horn cffd917165 system.h was being included in tons of places, without any good reason; reduced this (total dependencies on system.h went down from 193 to 85 files) 
svn-id: r16527
 2005-01-10 22:06:49 +00:00
Max Horn 47280d9433 Updated copyright 
svn-id: r16398
 2005-01-01 16:09:25 +00:00
Max Horn b15d92e470 Fix running ScummVM in plugin-mode 
svn-id: r16360
 2004-12-28 20:29:42 +00:00
Max Horn ce8c99bf62 Rename remaining OSystem methods to match our coding guidelines 
svn-id: r15332
 2004-09-28 20:19:37 +00:00
Jamieson Christian 4ee0365a23 Tweaked a few things to accommodate 
MSVC6's idiosyncracies.

svn-id: r13644
 2004-04-26 20:28:34 +00:00
Max Horn aa6ec62e9d Patch #885904 (Flac Support) with some tweaks by me 
svn-id: r12984
 2004-02-22 14:11:16 +00:00
Max Horn 033ff78ae9 updated copyright notice 
svn-id: r12176
 2004-01-06 12:45:34 +00:00
Max Horn e049e24a2c no need to specify game data path here: File::setDefaultDirectory() took care of that 
svn-id: r12135
 2004-01-04 14:06:06 +00:00
Max Horn 81481ad6da more MAD MP3 / Ogg Vorbis cleanup: try not to expose anything about the libs used for MP3/Vorbis support -> this eases changing the implementations, and reduces header dependencies (and thus compile time) :-) 
svn-id: r12097
 2004-01-03 01:25:45 +00:00
Max Horn e9269257f3 turned PlayingSoundHandle into an 'opaque' (well not really :-) data type, mainly because people kept (accidentally and sometimes on purpose :-) misusing them 
svn-id: r11881
 2003-12-24 00:25:18 +00:00
Max Horn 0ee89a3277 init some more member vars 
svn-id: r11597
 2003-12-12 15:05:33 +00:00
Torbjörn Andersson 813e8fbdab Emergency bugfixes: 
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
 2003-12-11 08:18:51 +00:00