libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-31 22:53:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
30,918 Commits 5 Branches 5 Tags 1.8 GiB
4b52d7ae2a
Commit Graph

266 Commits

Author SHA1 Message Date
Torbjörn Andersson
9e2f9b338f Removed a (hopefully) obsolete FIXME comment. 
svn-id: r35690
 2009-01-03 00:08:46 +00:00
Jordi Vilalta Prat
b1999a2a16 Fixed indentation and removed whitespaces at the end of line 
svn-id: r35481
 2008-12-22 11:22:15 +00:00
Torbjörn Andersson
2bbc958373 Made getSoundElapseTime() work better when the sound has been paused. A new 
variable, _pauseTime, keeps track of how long the sound has been paused since the
last mixer time stamp.

svn-id: r34955
 2008-11-09 13:28:59 +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
Max Horn
c45d632f3b Patch ##1956946 (Audio::Mixer internal API revision) with some tweaks 
svn-id: r32828
 2008-06-28 15:28:29 +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
19ad20c201 Don't be so strict about un-pausing sounds which are not paused currently 
svn-id: r28163
 2007-07-22 11:54:35 +00:00
Max Horn
93b1a53c72 Changed semantics of Mixer::pause*() methods -- if you pause n times, you 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-30 21:02:58 +00:00
Max Horn
0d77f50d6b Removed dead code 
svn-id: r27066
 2007-06-03 15:56:14 +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
Eugene Sandulenko
06c2976fa0 More fixes for MSVC8 warnings. 
svn-id: r26063
 2007-03-10 15:04:06 +00:00
Max Horn
029b8c4323 Changed the order of the parameters of makeLinearInputStream to resemble Mixer::playRaw; also made makeLinearInputStream honor FLAG_LOOP (and for this, changed its loop related params slightly) 
svn-id: r25926
 2007-03-02 15:26:22 +00:00
Max Horn
c2dbd22692 Added reverseStereo parameter to Mixer::playInputStream; changed Mixer::playRaw to use Mixer::playInputStream 
svn-id: r25923
 2007-03-02 14:49:07 +00:00
Max Horn
8366420474 Remove unneeded #includes 
svn-id: r25838
 2007-02-24 23:41:20 +00:00
Max Horn
227a080e5b Patch #1663933 (Kill premix channel) with a few tiny additional tweaks by me 
svn-id: r25752
 2007-02-20 18:50:17 +00:00
Max Horn
8cef52294c Fix for bug #1660559: MANIAC/ZAK: Music does not stop when pausing (regression) 
svn-id: r25605
 2007-02-15 12:47:09 +00:00
Max Horn
cb49cbdd45 * Reimplemented Mixer::pauseAll to simply invoke pause on all channels 
(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
 2007-02-03 19:05:53 +00:00
Max Horn
07f7761479 Backend modularization: Create timer manager, savefile manager and audio mixer in the backends for increased flexibility 
svn-id: r24443
 2006-10-22 15:42:29 +00:00
Max Horn
9217472f0e With this change, backends are now responsible for instantiating their OSystem class before calling scummvm_main (Note: PalmOS and Symbian are not yet converted, and won't work currently) 
svn-id: r21557
 2006-04-02 14:16:31 +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
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
Max Horn
1a615346ab Moved class SoundMixer to Audio::Mixer (didn't call the namespace 'Sound' because we already have many classes with that name) 
svn-id: r18039
 2005-05-10 23:48:48 +00:00
Max Horn
cca744f69a Comply to our coding conventions 
svn-id: r17975
 2005-05-08 21:49:52 +00:00
Max Horn
9e2e00881f Renamed getActiveChannelSoundID to getSoundID and fixed its semantics to avoid race conditions 
svn-id: r17377
 2005-04-04 17:43:00 +00:00
Travis Howell
f230fe65e8 Add 8 sound channel support for HE games 
-Allows sound looping to work

Added support for WAVE format musuc used in later HE100 games.

svn-id: r17372
 2005-04-04 11:43:25 +00:00
Max Horn
3084724d7d To prevent race conditions, SoundMixer::isSoundHandleActive must lock the mixer mutex. That change might however cause regressions (read: dead locks) if some code calls isSoundHandleActive from within a sound callback... if you encounter any, please tell me 
svn-id: r17209
 2005-03-23 16:41:44 +00:00
Max Horn
61d0e3f02c Make sure SoundHandle's are inited 
svn-id: r17194
 2005-03-22 18:29:02 +00:00
Max Horn
0e784d41d7 Simplified SoundHandle implementation 
svn-id: r17107
 2005-03-12 20:26:49 +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
cda823ea63 It's kMaxMixerVolume, not 256 (we might change it to 255 eventually) 
svn-id: r16747
 2005-02-06 20:35:06 +00:00
Travis Howell
bebad400d6 Check sound queue for music in HE games. 
Avoid extra sound channel.

svn-id: r16706
 2005-01-30 11:03:49 +00:00
Max Horn
abd12dd1b6 Use class Mutex instead of MutexRef 
svn-id: r16679
 2005-01-28 22:05:51 +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
f52be9df68 Changed OSystem::instance() to return a reference, not a pointer (it now matches the Singleton interface) 
svn-id: r16402
 2005-01-01 18:53:47 +00:00
Max Horn
47280d9433 Updated copyright 
svn-id: r16398
 2005-01-01 16:09:25 +00:00
Max Horn
160a28e912 Fixing hasActiveChannelOfType 
svn-id: r16354
 2004-12-28 11:19:36 +00:00
Max Horn
bc882a1af4 Introduced two new constants SoundMixer::kMaxChannelVolume and SoundMixer::kMaxMixerVolume, for clarity 
svn-id: r16348
 2004-12-27 23:33:19 +00:00
Max Horn
357eb38b49 Allow premix channels to use a custom sound type 
svn-id: r16332
 2004-12-27 02:58:55 +00:00
Max Horn
67b311713d Added 'sound types' to the mixer - for now, only plain (for the premixer), SFX and music; volume is now controlled based on the sound type 
svn-id: r16330
 2004-12-27 00:27:00 +00:00
Max Horn
10dd548b85 Changed parameter order of SoundMixer::playInputStream to match that of playRaw 
svn-id: r15950
 2004-11-28 23:02:28 +00:00
Jerome Fisher
45d92a02f4 Added a "permanent" field to Channels, which simply prevents them from being deleted during stopAll(). 
I hope this doesn't step on anyone's toes; it was quite urgent, since loading a saved game stopped MT-32 emulation audio forever.

svn-id: r15946
 2004-11-28 22:15:09 +00:00
Max Horn
f6b495c8bc Assume for now that the premixer is always used for music playback (as opposed to being used for SFX); this affects the volume (see bug #1049375) 
svn-id: r15940
 2004-11-28 13:57:49 +00:00
Max Horn
c51b1266c0 Removed the (highly SCUMM specific) 'appendable stream' API from SoundMixer; SCUMM now uses the appendable stream directly 
svn-id: r15919
 2004-11-27 17:09:05 +00:00
Max Horn
573e02bb4c Removed the old setupPremix version, it is not needed anymore. Also fixed some doxygen comments (they were being assigned to the wrong things) 
svn-id: r15918
 2004-11-27 16:26:54 +00:00
Max Horn
ba74a8e7f6 Added some more mixer doxygen docs; cleaned up Mixer API a bit, removing some very specialised methods 
svn-id: r15914
 2004-11-27 15:58:18 +00:00
Max Horn
1a7ca2dc2a AudioStream::read() has been removed quite some time ago, now making sure that change is reflected everywhere 
svn-id: r15911
 2004-11-27 13:54:09 +00:00
Max Horn
1036e88aa6 Implement premix proc via an AudioStream / Channel (eventually we'll remove the setupPremix method which takes a proc pointer) 
svn-id: r15522
 2004-10-11 22:01:21 +00:00