Commit graph

49 commits

Author SHA1 Message Date
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
Max Horn
a26b3bfde6 SCI: Get rid of extra layer around our timer manager
svn-id: r38947
2009-02-28 06:14:42 +00:00
Willem Jan Palenstijn
6eeec1d295 Add FIXME: We need a pcm_device->exit() function,
to release the mixer channel allocated for pcm_device in ScummVM's mixer.

svn-id: r38941
2009-02-27 23:53:52 +00:00
Willem Jan Palenstijn
d3e60f2ae3 Depend on backend timer API instead of a new mutex
This fixes a deadlock between the backend's timer mutex and
the sound callbackMutex that would occur while restoring a game.

svn-id: r38939
2009-02-27 22:20:11 +00:00
Eugene Sandulenko
d53c75fc8f Fix code formatting
svn-id: r38930
2009-02-27 12:59:02 +00:00
Max Horn
170916201c SCI: Moved almost all files from include/ to other dirs; only include/engine.h remains
svn-id: r38920
2009-02-27 02:23:00 +00:00
Andre Heider
dbe632e8ed protect the sfx timer with the callbackMutex to fix the race the condition when restarting or restoring a game.
svn-id: r38913
2009-02-26 19:32:22 +00:00
Paweł Kołodziejski
91ee9a3eb8 not needed this includes anymore
svn-id: r38857
2009-02-24 21:13:32 +00:00
Andre Heider
357299c570 substitute all time related functions, removing sci_gettime sci_get_current_time altogether.
svn-id: r38845
2009-02-24 18:31:05 +00:00
Jordi Vilalta Prat
b5ce8d9320 Whitespace cleanup
svn-id: r38783
2009-02-22 13:11:43 +00:00
Max Horn
eb37789f6f SCI: Renamed include/gfx_*.h to gfx/gfx_*.h and likewise for sfx header files
svn-id: r38735
2009-02-21 19:33:01 +00:00
Paweł Kołodziejski
a5cf6bfd85 cleanup
svn-id: r38712
2009-02-21 17:29:03 +00:00
Paweł Kołodziejski
d23166c2a1 formating
svn-id: r38706
2009-02-21 16:20:53 +00:00
Willem Jan Palenstijn
34f90ac043 revert large parts of r38621. error() is for fatal errors and does not return. warning() is not for debugging status messages.
svn-id: r38696
2009-02-21 14:11:41 +00:00
Willem Jan Palenstijn
baa7c7b997 remove some endlines from warning() calls
svn-id: r38683
2009-02-21 11:26:54 +00:00
Oystein Eftevaag
25f7c37171 Wrapped the SCI engine in the Sci namespace.
svn-id: r38676
2009-02-21 10:23:36 +00:00
Filippos Karapetis
2ddce51a56 Changed more messages to warnings/errors
svn-id: r38621
2009-02-20 20:39:02 +00:00
Max Horn
a2aba2f18e SCI: Renamed resource_mgr_t -> ResourceManager; added remark to 'the other resource manager' that it should be renamed to GraphicsManager or so
svn-id: r38592
2009-02-20 15:24:22 +00:00
Filippos Karapetis
45d3382c9a We only got 1 mixer - removed the unneeded file mixers.cpp
svn-id: r38569
2009-02-20 00:31:22 +00:00
Eugene Sandulenko
b0abacf7cd Update headers. sfx/
svn-id: r38410
2009-02-17 15:07:44 +00:00
Filippos Karapetis
ffc07febeb Removed unused SFX code
svn-id: r38396
2009-02-17 09:15:17 +00:00
Jordi Vilalta Prat
c8a3a05a5d SCI: Changed pcm_device and timer "driver" functionality to use directly the ScummVM modules
svn-id: r38373
2009-02-16 16:23:48 +00:00
Max Horn
29611bc7ea SCI: Run astyle to make the code be more compliant with our Code Formatting Guidelines: sfx dir
svn-id: r38322
2009-02-15 22:34:41 +00:00
Willem Jan Palenstijn
f046858d5d fix race condition: sfx_exit could stop and delete the mixer while the mixing callback was being executed
svn-id: r38263
2009-02-15 16:09:55 +00:00
Max Horn
9daed50e01 Fixed lots of warnings and errors (on my system) by backporting a patch I had sent the FreeSCI folks some time ago (but apparently it never made it, or only made it to a branch not imported?)
svn-id: r38245
2009-02-15 14:46:42 +00:00
Filippos Karapetis
24dc986944 Silenced a ton of warnings, and disabled several unreferenced functions (dead code) - hopefully, compilation hasn't been broken...
svn-id: r38243
2009-02-15 14:26:33 +00:00
Eugene Sandulenko
e241843bec - Remove some unneeded files
- Mass rename .c to .cpp

svn-id: r38227
2009-02-15 11:39:07 +00:00
Renamed from engines/sci/sfx/core.c (Browse further)