Commit Graph

66 Commits

Author SHA1 Message Date
Willem Jan Palenstijn
8dd3492194 SCI: don't let TimerSongIterator loop forever, and don't immediately
signal completion when starting it. This fixes a sync issue with
the departing spaceship at the start of SQ4CD (after the intro).

svn-id: r42385
2009-07-11 15:00:40 +00:00
Filippos Karapetis
2b5fac58d5 Applied patch 2818733 - "SCI: Timer iterator for audio resources played via doSound"
svn-id: r42375
2009-07-11 06:53:39 +00:00
Filippos Karapetis
a62b26ea80 Silenced the very chatty song iterator console messages by converting them to appropriate debug messages
svn-id: r42240
2009-07-07 20:43:27 +00:00
Filippos Karapetis
522b161bec Replaced sciprintf() calls with printf, DebugPrintf, warning and error calls
svn-id: r42167
2009-07-06 10:39:22 +00:00
Willem Jan Palenstijn
eba5780fc0 When creating a CleanupSongIterator, transfer death listeners to it
svn-id: r42113
2009-07-05 01:16:53 +00:00
Willem Jan Palenstijn
f907dc7fc7 When morphing a TeeSongIterator, transfer death listeners to remaining child
svn-id: r42112
2009-07-04 23:52:24 +00:00
Max Horn
22507d70bb SCI: C++ified the song iterator code a little bit more
svn-id: r41360
2009-06-07 23:05:11 +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
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
99b520dd09 SCI: Merged SfxPlayer/NewPlayer code into sfx/core.cpp
svn-id: r40965
2009-05-28 22:02:45 +00:00
Max Horn
50157fbca9 SCI: Undo commit #40917 (SongIteratorChannel::resetSynthChannels now again does something)
svn-id: r40921
2009-05-26 15:46:54 +00:00
Filippos Karapetis
d8c1725fbd Fixed compilation under MSVC
svn-id: r40917
2009-05-26 14:59:41 +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
Max Horn
7d5f3e1714 Turned some static tables into static const tables; added some FIXME comments to global static vars that should be removed (many more exist in SCI, Tinsel, and some other engines)
svn-id: r40908
2009-05-26 11:30:21 +00:00
Walter van Niftrik
8adc948001 SCI: Adlib: added support for rhythm channel
svn-id: r40874
2009-05-24 22:32:21 +00:00
Max Horn
bba91075bf removed trailing whitespaces
svn-id: r40742
2009-05-20 17:53:31 +00:00
Filippos Karapetis
9cdb4c36a7 Fixed regression in SCI1 games from commit #40518
svn-id: r40523
2009-05-13 16:22:26 +00:00
Max Horn
37a0157c97 SCI: cleanup
svn-id: r40518
2009-05-12 23:32:32 +00:00
Max Horn
0255cd0213 SCI: Removed sci_memory.h/.cpp
svn-id: r40514
2009-05-12 23:30:10 +00:00
Max Horn
3eab407cd5 SCI: Replaced memory ref counting code in the SongIterator code by a simple Common::Array<byte> object; also doxygenified some source comments
svn-id: r40032
2009-04-20 19:28:55 +00:00
Max Horn
4da6fbbb76 SCI: Memory 'ref counting' code is only used by song iterators -> move it there, make it private (to be replaced one day by something else, e.g. Common::SharedPtr)
svn-id: r39305
2009-03-10 19:08:07 +00:00
Max Horn
7f1a9b385d SCI: SongIterator::Message only needs to transfer a single argument, so get rid of the second slot
svn-id: r39290
2009-03-10 02:57:30 +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
Willem Jan Palenstijn
1e4c9488f2 Don't adjust data pointer in makeStream.
It is already adjusted in getAudioStream.

svn-id: r39276
2009-03-09 21:11:39 +00:00
Max Horn
7ec2a98177 SCI: Added BaseSongIterator copy constructor which invokey sci_refcount_incref
svn-id: r39273
2009-03-09 19:55:18 +00:00
Willem Jan Palenstijn
d2514d20b9 Reset child iterators on deletion.
This fixes an illegal access in ~TeeSongIterator.

svn-id: r39272
2009-03-09 19:44:10 +00:00
Max Horn
7bfab75a08 SCI: Fixed regression in new_fast_forward_iterator
svn-id: r39215
2009-03-08 08:17:59 +00:00
Filippos Karapetis
1e29983d8e Replaced getInt16, getUInt16 and putInt16
svn-id: r39189
2009-03-07 16:14:20 +00:00
Max Horn
18b3454280 SCI: Replaced linked list of Sci1Samples by a Common::List
svn-id: r39178
2009-03-07 06:57:17 +00:00
Max Horn
c2f08b10d2 SCI: More cleanup in the song iterator codebase
svn-id: r39177
2009-03-07 06:56:39 +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
e134281b5c SCI: Fixed (I hope) song iterator death listeners; and some cleanup
svn-id: r39157
2009-03-06 17:39:46 +00:00
Max Horn
e3ac2ecfaa SCI: Started to revamp the song iterator death notification system (which currently is mess :)
svn-id: r39156
2009-03-06 17:39:15 +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
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
25e7d3a08d SCI: Renamed some sfx header files
svn-id: r39006
2009-03-01 06:02:17 +00:00
Andre Heider
b2cd5beb9e clean up some warnings
svn-id: r38965
2009-02-28 13:41:43 +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
Eugene Sandulenko
d53c75fc8f Fix code formatting
svn-id: r38930
2009-02-27 12:59:02 +00:00
Paweł Kołodziejski
91ee9a3eb8 not needed this includes anymore
svn-id: r38857
2009-02-24 21:13:32 +00:00
Max Horn
1e4db221e5 SCI: Moved engines/sci/include/sci_memory.h and engines/sci/scicore/sci_memory.cpp into engines/sci/; moved macros from the header into the source file
svn-id: r38832
2009-02-24 05:39:10 +00:00
Jordi Vilalta Prat
b5ce8d9320 Whitespace cleanup
svn-id: r38783
2009-02-22 13:11:43 +00:00
Max Horn
d6e397233f SCI: More cleanup
svn-id: r38758
2009-02-21 22:40:58 +00:00
Max Horn
8430b662a9 SCI: Changed typedef struct -> struct
svn-id: r38752
2009-02-21 22:06:42 +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