Commit graph

53 commits

Author SHA1 Message Date
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
Max Horn
0d41ca8d38 SCI: Moved scicore/tools.cpp to tools.cpp, and include/resource.h to tools.h
svn-id: r38720
2009-02-21 18:28:38 +00:00
Filippos Karapetis
426def4f44 Turned back all fprintf/exit(1) bits into error()
svn-id: r38716
2009-02-21 18:16:17 +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
Oystein Eftevaag
25f7c37171 Wrapped the SCI engine in the Sci namespace.
svn-id: r38676
2009-02-21 10:23:36 +00:00
Max Horn
bcb1a71052 SCI: Fixed more warnings
svn-id: r38658
2009-02-21 04:10:21 +00:00
Travis Howell
c5abad4dea Switch error back to warning, to fix SCI 1.1 regression.
svn-id: r38648
2009-02-20 23:31:00 +00:00
Filippos Karapetis
80868065e6 Downgraded some errors to warnings and printf's
svn-id: r38642
2009-02-20 23:19:47 +00:00
Filippos Karapetis
2ddce51a56 Changed more messages to warnings/errors
svn-id: r38621
2009-02-20 20:39:02 +00:00
Eugene Sandulenko
b0abacf7cd Update headers. sfx/
svn-id: r38410
2009-02-17 15:07:44 +00:00
Filippos Karapetis
d39d83e525 Replaced sci_free() with free() - it's OK to free a NULL pointer, so the checking that sci_free() performed is not necessary
svn-id: r38406
2009-02-17 13:51:52 +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
Max Horn
a49d29cf6f cleanup, fixed warnings
svn-id: r38282
2009-02-15 19:15:43 +00:00