thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
33272 commits 35 branches 0 tags 1.4 GiB
Commit graph

76 commits

Author SHA1 Message Date
Filippos Karapetis
1bbab8f191 Some renaming: 
getresourceManager -> getResourceManger
resourceManager -> resMan
segmentManager ->segMan

svn-id: r43908
 2009-09-02 12:02:37 +00:00
Filippos Karapetis
ed66cad677 - Simplified the parameters of some functions 
- Replaced some EngineState parameters
- The SCI version is now obtained from the resource manager or the segment manager, thereby simplifying several functions
- Plugged 2 leaks in the fallback detector
- Renamed the segment manager and resource manager to "segmentManager" and "resourceManager" in all places, for consistency

svn-id: r43722
 2009-08-25 08:38:14 +00:00
Matthew Hoops
cba2897cc8 Truly fix endianness in the SOL decoder. Raw sounds are always in little endian order and now compressed are outputted to little endian too (and therefore the little endian mixer flag is always set). 
svn-id: r43576
 2009-08-21 03:31:34 +00:00
Matthew Hoops
b4c7cd0484 Fix 16-bit SOL audio on little endian systems. Fixes the white noise in the Gabriel Knight demo. 
svn-id: r43569
 2009-08-20 20:41:12 +00:00
Max Horn
c4f6295330 Fixed some more warnings observed on buildbot 
svn-id: r42010
 2009-07-01 20:51:34 +00:00
Walter van Niftrik
1fb78d577f SCI: Moved audio code from AudioResource to the sfx core. 
svn-id: r41486
 2009-06-12 23:46:23 +00:00
Max Horn
21d948ec05 SCI: Simplified SongLibrary code a bit 
svn-id: r41345
 2009-06-07 17:07:25 +00:00
Max Horn
62f596821e SCI: Objectified Song struct 'a bit' 
svn-id: r41344
 2009-06-07 17:07:07 +00:00
Max Horn
d07e9dfb13 SCI: Objectified SongLibrary 
svn-id: r41343
 2009-06-07 17:06:51 +00:00
Max Horn
f2ca788004 SCI: Renamed various song/songlib related structs and members 
svn-id: r41342
 2009-06-07 17:06:32 +00:00
Filippos Karapetis
da36901b07 Cleanup 
svn-id: r41202
 2009-06-05 23:08:35 +00:00
Filippos Karapetis
e55388c787 Removed script_error_flag and script_debug_flag, which were used to error out if something went wrong and open the debugger console. Changed all the places where they were used to error() out instead, as ScummVM's debugger console can open on error() 
svn-id: r41073
 2009-05-31 15:34:23 +00:00
Torbjörn Andersson
0999534749 The error() and warning() functions add ! and newline automatically. (I didn't 
look at debug() and debugC(), since I'm really bored with this now. :-)

svn-id: r41061
 2009-05-31 10:02:16 +00:00
Johannes Schickel
abe8cf0625 Typo. 
svn-id: r41054
 2009-05-31 01:11:06 +00:00
Max Horn
9423c75dae SCI: Added constructor&destructor to SfxState 
svn-id: r41047
 2009-05-30 20:41:10 +00:00
Max Horn
70a04c8b51 SCI: Made vocab_version static again (a global static var is bad, but a really global var is worse); also clarified some FIXME comments that we want to avoid *any* non-const global var, no matter whether it is static or not 
svn-id: r41045
 2009-05-30 20:37:33 +00:00
Filippos Karapetis
15d5b8436e Removed the "sfx_debuglog" command. Sound debug messages are now shown if kDebugLevelSound is specified 
svn-id: r41039
 2009-05-30 17:53:12 +00:00
Filippos Karapetis
c7c9f05cac Removed/replaced BREAKPOINT 
svn-id: r41025
 2009-05-30 10:42:08 +00:00
Max Horn
813853ccc2 SCI: Converted several fprintf(stderr) calls to warning/error (the remaining fprintf calls should probably be replaced by suitable debug/debugC/debugN invocations) 
svn-id: r40993
 2009-05-29 13:07:14 +00:00
Max Horn
d3bd7b622c SCI: Turned SfxState into a proper class (i.e., convert the sfx_ funcs to member methods) 
svn-id: r40973
 2009-05-28 22:48:15 +00:00
Max Horn
804242ae9f SCI: Merged NewPlayer and SfxPlayer 
svn-id: r40968
 2009-05-28 22:16:42 +00:00
Max Horn
99b520dd09 SCI: Merged SfxPlayer/NewPlayer code into sfx/core.cpp 
svn-id: r40965
 2009-05-28 22:02:45 +00:00
Max Horn
d70504c910 SCI: Renamed sfx_state_t -> SfxState, preparing it to become a class eventually 
svn-id: r40958
 2009-05-28 10:54:30 +00:00
Max Horn
01252c4aaf SCI: Some SFX player cleanup 
svn-id: r40956
 2009-05-28 10:29:11 +00:00
Filippos Karapetis
3e29b47ec3 Fixed a crash when exiting, a regression from the latest music driver changes 
svn-id: r40922
 2009-05-26 19:05:20 +00:00
Max Horn
7050c5065f SCI: removed realtime and polled player, as well as the sfx/device dir, after discussion with Walter 
svn-id: r40913
 2009-05-26 14:09:07 +00:00
Max Horn
1d00cc5df0 SCI: Turned sfx_player_t into a class SfxPlayer, and converted the existing players to subclasses of that 
svn-id: r40912
 2009-05-26 11:49:10 +00:00
Filippos Karapetis
d59796fb54 Objectified the AudioResource code (used for speech and digitized music in CD talkie games) 
svn-id: r40880
 2009-05-25 10:30:19 +00:00
Max Horn
37a0157c97 SCI: cleanup 
svn-id: r40518
 2009-05-12 23:32:32 +00:00
Max Horn
05c3c6ccb3 SCI: Replaced SFX_OK/SFX_ERROR by Common::Error, and got rid of sfx/sfx.h 
svn-id: r40517
 2009-05-12 23:31:55 +00:00
Filippos Karapetis
f1893d8f25 WIP (still non-working) code for speech sync in CD talkie games (like e.g. KQ5 CD and SQ4 CD), taken from Greg's SCI implementation. 
svn-id: r40142
 2009-04-25 08:50:42 +00:00
Walter van Niftrik
695bc36b9a SCI: Added a new song player (work-in-progress). 
svn-id: r39953
 2009-04-15 10:45:59 +00:00
Filippos Karapetis
966972def6 Fixed another crash right at the beginning of SQ4 
svn-id: r39347
 2009-03-11 23:44:22 +00:00
Max Horn
6b58973536 SCI: Renamed SongIteratorMessage -> SongIterator::Message; cleanup 
svn-id: r39289
 2009-03-10 02:42:22 +00:00
Max Horn
842a42b1bd SCI: More SongIterator refactoring. 
* Added SongIterator::clone()
* got rid of songit_clone()
* removed SIMSG_CLONE and related code
* removed SongIterator::flags
* turned songit_new_tee into TeeSongIterator constructor

svn-id: r39288
 2009-03-10 02:41:56 +00:00
Max Horn
4e6a7d83d1 SCI: Rewrote handling of song wakeup times & (iterator) delays, to avoid rounding issues between ticks (1/60s) and milliseconds; also fixed a bug (coming from Glutton ;) where delays measured in millisecs were treated as ticks instead. Thanks to Walter for the precursor of this patch 
svn-id: r39263
 2009-03-09 16:15:35 +00:00
Max Horn
54e1256b0e SCI: Reduce SFX header dependencies 
svn-id: r39159
 2009-03-06 18:11:12 +00:00
Max Horn
763275f269 SCI: Continued C++ification of SongIterator code 
svn-id: r39158
 2009-03-06 17:53:11 +00:00
Max Horn
0f3d67c1ac SCI: C++ifyed SongIterator and its subclasses 
svn-id: r39152
 2009-03-06 07:25:48 +00:00
Max Horn
018d19e020 SCI: Some cleanup to the SongIteratorMessage code 
svn-id: r39151
 2009-03-06 07:25:37 +00:00
Max Horn
24dac898fe SCI: Converted SongIterator::get_pcm_feed into a virtual method 
svn-id: r39150
 2009-03-06 07:25:25 +00:00
Max Horn
5e2ee01b39 SCI: Renamed lots of classes related to song iterators; allocate song iterators via new/delete instead of malloc/free 
svn-id: r39148
 2009-03-06 07:25:06 +00:00
Max Horn
dbb59ce3a1 SCI: Merged polled player & PCMFeedAudioStream -> PolledPlayerAudioStream 
svn-id: r39118
 2009-03-04 07:59:33 +00:00
Max Horn
ac2d012ae5 SCI: Merged sfx/mixer.cpp into sfx/player/polled.cpp 
svn-id: r39116
 2009-03-04 07:38:49 +00:00
Max Horn
e783859d5c SCI: Replaced sfx_iterator_make_feed and associated code by Audio::makeLinearInputStream 
svn-id: r39115
 2009-03-04 07:31:31 +00:00
Max Horn
92eceb741a SCI: mixer cleanup 
svn-id: r39111
 2009-03-04 06:23:14 +00:00
Filippos Karapetis
a4e4de9ecd Fixed crash in SQ4 
svn-id: r39091
 2009-03-03 17:20:02 +00:00
Max Horn
00db87563a SCI: Reimplemented the SCI mixer based on the old SCI DC mixer by walter, and by taking advantage of ScummVM's mixers capabilities. Got rid of sfx_pcm_mixer_t 
svn-id: r39053
 2009-03-01 21:23:44 +00:00
Max Horn
25e7d3a08d SCI: Renamed some sfx header files 
svn-id: r39006
 2009-03-01 06:02:17 +00:00
Max Horn
413ded4ce4 SCI: Get rid around the first layer around the ScummVM audio mixer. Also resolve the FIXME about releasing the mixer channel we allocated 
svn-id: r38949
 2009-02-28 06:48:53 +00:00