[Scummvm-cvs-logs] SF.net SVN: scummvm:[40518] scummvm/trunk/engines/sci
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Wed May 13 01:32:32 CEST 2009
Revision: 40518
http://scummvm.svn.sourceforge.net/scummvm/?rev=40518&view=rev
Author: fingolfin
Date: 2009-05-12 23:32:32 +0000 (Tue, 12 May 2009)
Log Message:
-----------
SCI: cleanup
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/ksound.cpp
scummvm/trunk/engines/sci/engine/savegame.cpp
scummvm/trunk/engines/sci/sfx/core.cpp
scummvm/trunk/engines/sci/sfx/iterator.cpp
scummvm/trunk/engines/sci/sfx/iterator.h
scummvm/trunk/engines/sci/sfx/iterator_internal.h
Modified: scummvm/trunk/engines/sci/engine/ksound.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/ksound.cpp 2009-05-12 23:31:55 UTC (rev 40517)
+++ scummvm/trunk/engines/sci/engine/ksound.cpp 2009-05-12 23:32:32 UTC (rev 40518)
@@ -121,7 +121,7 @@
PUT_SEL32V(obj, flags, flags);
}
-SongIterator *build_iterator(EngineState *s, int song_nr, int type, songit_id_t id) {
+SongIterator *build_iterator(EngineState *s, int song_nr, SongIteratorType type, songit_id_t id) {
Resource *song = s->resmgr->findResource(kResourceTypeSound, song_nr, 0);
if (!song)
Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp 2009-05-12 23:31:55 UTC (rev 40517)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp 2009-05-12 23:32:32 UTC (rev 40518)
@@ -43,7 +43,7 @@
namespace Sci {
// from ksound.cpp:
-SongIterator *build_iterator(EngineState *s, int song_nr, int type, songit_id_t id);
+SongIterator *build_iterator(EngineState *s, int song_nr, SongIteratorType type, songit_id_t id);
#pragma mark -
@@ -705,7 +705,7 @@
static void reconstruct_sounds(EngineState *s) {
song_t *seeker;
- int it_type = s->resmgr->_sciVersion >= SCI_VERSION_01 ? SCI_SONG_ITERATOR_TYPE_SCI1 : SCI_SONG_ITERATOR_TYPE_SCI0;
+ SongIteratorType it_type = s->resmgr->_sciVersion >= SCI_VERSION_01 ? SCI_SONG_ITERATOR_TYPE_SCI1 : SCI_SONG_ITERATOR_TYPE_SCI0;
if (s->sound.songlib.lib)
seeker = *(s->sound.songlib.lib);
Modified: scummvm/trunk/engines/sci/sfx/core.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/core.cpp 2009-05-12 23:31:55 UTC (rev 40517)
+++ scummvm/trunk/engines/sci/sfx/core.cpp 2009-05-12 23:32:32 UTC (rev 40518)
@@ -27,7 +27,6 @@
#include "sci/tools.h"
#include "sci/sfx/core.h"
-#include "sci/sfx/iterator_internal.h"
#include "sci/sfx/player.h"
#include "sci/sfx/sci_midi.h"
@@ -670,12 +669,12 @@
SongIterator::Message msg = SongIterator::Message(handle, SIMSG_SET_LOOPS(loops));
ASSERT_SONG(song);
+ song->loops = loops;
#ifdef DEBUG_SONG_API
fprintf(stderr, "[sfx-core] Setting loops on %08lx to %d\n",
handle, loops);
#endif
songit_handle_message(&(song->it), msg);
- song->loops = ((BaseSongIterator *)song->it)->loops;
if (player/* && player->send_iterator_message*/)
/* FIXME: The above should be optional! */
@@ -684,14 +683,13 @@
void sfx_song_set_hold(sfx_state_t *self, song_handle_t handle, int hold) {
song_t *song = song_lib_find(self->songlib, handle);
- SongIterator::Message msg
- = SongIterator::Message(handle, SIMSG_SET_HOLD(hold));
+ SongIterator::Message msg = SongIterator::Message(handle, SIMSG_SET_HOLD(hold));
ASSERT_SONG(song);
song->hold = hold;
#ifdef DEBUG_SONG_API
fprintf(stderr, "[sfx-core] Setting hold on %08lx to %d\n",
- handle, loops);
+ handle, hold);
#endif
songit_handle_message(&(song->it), msg);
Modified: scummvm/trunk/engines/sci/sfx/iterator.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/iterator.cpp 2009-05-12 23:31:55 UTC (rev 40517)
+++ scummvm/trunk/engines/sci/sfx/iterator.cpp 2009-05-12 23:32:32 UTC (rev 40518)
@@ -69,14 +69,14 @@
#define CHECK_FOR_END_ABSOLUTE(offset) \
if (offset > self->_data.size()) { \
- warning(SIPFX "Reached end of song without terminator (%x/%x) at %d!", offset, self->_data.size(), __LINE__); \
+ warning("Reached end of song without terminator (%x/%x) at %d!", offset, self->_data.size(), __LINE__); \
return SI_FINISHED; \
}
#define CHECK_FOR_END(offset_augment) \
if ((channel->offset + (offset_augment)) > channel->end) { \
channel->state = SI_STATE_FINISHED; \
- warning(SIPFX "Reached end of track %d without terminator (%x+%x/%x) at %d!", channel->id, channel->offset, offset_augment, channel->end, __LINE__); \
+ warning("Reached end of track %d without terminator (%x+%x/%x) at %d!", channel->id, channel->offset, offset_augment, channel->end, __LINE__); \
return SI_FINISHED; \
}
@@ -107,6 +107,25 @@
#define PARSE_FLAG_PARAMETRIC_CUE (1 << 1) /* Assume that cues take an additional "cue value" argument */
/* This implements a difference between SCI0 and SCI1 cues. */
+void SongIteratorChannel::init(int id_, int offset_, int end_) {
+ playmask = PLAYMASK_NONE; /* Disable all channels */
+ id = id_;
+ notes_played = 0;
+ state = SI_STATE_DELTA_TIME;
+ loop_timepos = 0;
+ total_timepos = 0;
+ timepos_increment = 0;
+ delay = 0; /* Only used for more than one channel */
+ last_cmd = 0xfe;
+
+ offset
+ = loop_offset
+ = initial_offset
+ = offset_;
+ end = end_;
+ saw_notes = 0;
+}
+
void SongIteratorChannel::resetSynthChannels() {
byte buf[5];
tell_synth_func *tell = sfx_get_player_tell_func();
@@ -362,7 +381,7 @@
}
case SI_STATE_UNINITIALISED:
- warning(SIPFX "Attempt to read command from uninitialized iterator!");
+ warning("Attempt to read command from uninitialized iterator!");
self->init();
return self->nextCommand(buf, result);
@@ -418,7 +437,7 @@
}
default:
- warning(SIPFX "Invalid iterator state %d!", channel->state);
+ warning("Invalid iterator state %d!", channel->state);
BREAKPOINT();
return SI_FINISHED;
}
@@ -465,7 +484,7 @@
Common::Array<byte>::iterator iter = Common::find(self->_data.begin() + offset, self->_data.end(), SCI0_END_OF_SONG);
if (iter == self->_data.end()) {
- warning(SIPFX "Playing unterminated song!");
+ warning("Playing unterminated song!");
return 1;
}
@@ -479,7 +498,7 @@
}
if (!found_it) {
- warning(SIPFX "Song indicates presence of PCM, but"
+ warning("Song indicates presence of PCM, but"
" none found (finally at offset %04x)", offset);
return 1;
@@ -497,7 +516,7 @@
if (offset + SCI0_PCM_DATA_OFFSET + size != self->_data.size()) {
int d = offset + SCI0_PCM_DATA_OFFSET + size - self->_data.size();
- warning(SIPFX "PCM advertizes %d bytes of data, but %d"
+ warning("PCM advertizes %d bytes of data, but %d"
" bytes are trailing in the resource!",
size, self->_data.size() - (offset + SCI0_PCM_DATA_OFFSET));
@@ -610,25 +629,6 @@
return channel.total_timepos;
}
-static void _base_init_channel(SongIteratorChannel *channel, int id, int offset, int end) {
- channel->playmask = PLAYMASK_NONE; /* Disable all channels */
- channel->id = id;
- channel->notes_played = 0;
- channel->state = SI_STATE_DELTA_TIME;
- channel->loop_timepos = 0;
- channel->total_timepos = 0;
- channel->timepos_increment = 0;
- channel->delay = 0; /* Only used for more than one channel */
- channel->last_cmd = 0xfe;
-
- channel->offset
- = channel->loop_offset
- = channel->initial_offset
- = offset;
- channel->end = end;
- channel->saw_notes = 0;
-}
-
Sci0SongIterator::Sci0SongIterator(byte *data, uint size, songit_id_t id)
: BaseSongIterator(data, size, id) {
channel_mask = 0xffff; // Allocate all channels by default
@@ -648,7 +648,7 @@
ccc = 0; /* Reset cumulative cue counter */
active_channels = 1;
- _base_init_channel(&channel, 0, SCI0_MIDI_OFFSET, _data.size());
+ channel.init(0, SCI0_MIDI_OFFSET, _data.size());
channel.resetSynthChannels();
if (_data[0] == 2) /* Do we have an embedded PCM? */
@@ -679,10 +679,7 @@
{0xff, 0xff},
}; /* Maps bit number to device ID */
-#define SONGDATA(x) self->_data[offset + (x)]
-#define SCI1_CHANDATA(off) self->_data[channel->offset + (off)]
-
-static int _sci1_sample_init(Sci1SongIterator *self, int offset) {
+static int _sci1_sample_init(Sci1SongIterator *self, const int offset) {
Sci1Sample sample;
int rate;
int length;
@@ -716,7 +713,7 @@
sample.announced = false;
- /* Perform insertion sort */
+ /* Insert into the sample list at the right spot, keeping it sorted by delta */
Common::List<Sci1Sample>::iterator seeker = self->_samples.begin();
while (seeker != self->_samples.end() && seeker->delta < begin)
++seeker;
@@ -732,24 +729,24 @@
self->_samples.clear();
// self->_deviceId = 0x0c;
- if (SONGDATA(0) == 0xf0) {
- self->priority = SONGDATA(1);
+ if (self->_data[offset] == 0xf0) {
+ self->priority = self->_data[offset + 1];
offset += 8;
}
- while (SONGDATA(0) != 0xff
- && SONGDATA(0) != self->_deviceId) {
+ while (self->_data[offset] != 0xff
+ && self->_data[offset] != self->_deviceId) {
offset++;
CHECK_FOR_END_ABSOLUTE(offset + 1);
- while (SONGDATA(0) != 0xff) {
+ while (self->_data[offset] != 0xff) {
CHECK_FOR_END_ABSOLUTE(offset + 7);
offset += 6;
}
offset++;
}
- if (SONGDATA(0) == 0xff) {
+ if (self->_data[offset] == 0xff) {
sciprintf("[iterator-1] Song does not support"
" hardware 0x%02x\n",
self->_deviceId);
@@ -758,7 +755,7 @@
offset++;
- while (SONGDATA(0) != 0xff) { /* End of list? */
+ while (self->_data[offset] != 0xff) { /* End of list? */
uint track_offset;
int end;
offset += 2;
@@ -781,27 +778,21 @@
break; /* Scan for remaining samples */
} else {
int channel_nr = self->_data[track_offset] & 0xf;
- SongIteratorChannel *channel =
- &(self->_channels[self->_numChannels++]);
+ SongIteratorChannel &channel =
+ self->_channels[self->_numChannels++];
if (self->_data[track_offset] & 0xf0)
printf("Channel %d has mapping bits %02x\n",
channel_nr, self->_data[track_offset] & 0xf0);
- _base_init_channel(channel,
- channel_nr,
- /* Skip over header bytes: */
- track_offset + 2,
- track_offset + end);
- channel->resetSynthChannels();
+ // Add 2 to skip over header bytes */
+ channel.init(channel_nr, track_offset + 2, track_offset + end);
+ channel.resetSynthChannels();
- self->polyphony[self->_numChannels - 1]
- = SCI1_CHANDATA(-1);
- self->importance[self->_numChannels - 1]
- = self->polyphony[self->_numChannels - 1] >> 4;
- self->polyphony[self->_numChannels - 1] &= 15;
+ self->polyphony[self->_numChannels - 1] = self->_data[channel.offset - 1] & 15;
+ self->importance[self->_numChannels - 1] = self->_data[channel.offset - 1] >> 4;
- channel->playmask = ~0; /* Enable all */
+ channel.playmask = ~0; /* Enable all */
self->channel_mask |= (1 << channel_nr);
CHECK_FOR_END_ABSOLUTE(offset + end);
@@ -828,104 +819,60 @@
return 0; /* Success */
}
-#undef SONGDATA
+int Sci1SongIterator::getSmallestDelta() const {
+ int d = -1;
+ for (int i = 0; i < _numChannels; i++)
+ if (_channels[i].state == SI_STATE_COMMAND
+ && (d == -1 || _channels[i].delay < d))
+ d = _channels[i].delay;
-static int _sci1_get_smallest_delta(Sci1SongIterator *self) {
- int i, d = -1;
- for (i = 0; i < self->_numChannels; i++)
- if (self->_channels[i].state == SI_STATE_COMMAND
- && (d == -1 || self->_channels[i].delay < d))
- d = self->_channels[i].delay;
-
- if (!self->_samples.empty() && self->_samples.begin()->delta < d)
- return self->_samples.begin()->delta;
+ if (!_samples.empty() && _samples.begin()->delta < d)
+ return _samples.begin()->delta;
else
return d;
}
-static void _sci1_update_delta(Sci1SongIterator *self, int delta) {
- int i;
+void Sci1SongIterator::updateDelta(int delta) {
+ if (!_samples.empty())
+ _samples.begin()->delta -= delta;
- if (!self->_samples.empty())
- self->_samples.begin()->delta -= delta;
-
- for (i = 0; i < self->_numChannels; i++)
- if (self->_channels[i].state == SI_STATE_COMMAND)
- self->_channels[i].delay -= delta;
+ for (int i = 0; i < _numChannels; i++)
+ if (_channels[i].state == SI_STATE_COMMAND)
+ _channels[i].delay -= delta;
}
-static int _sci1_no_delta_time(Sci1SongIterator *self) { /* Checks that none of the channels is waiting for its delta to be read */
- int i;
-
- for (i = 0; i < self->_numChannels; i++)
- if (self->_channels[i].state == SI_STATE_DELTA_TIME)
- return 0;
-
- return 1;
+bool Sci1SongIterator::noDeltaTime() const {
+ for (int i = 0; i < _numChannels; i++)
+ if (_channels[i].state == SI_STATE_DELTA_TIME)
+ return false;
+ return true;
}
-#if 0
-// Unreferenced - removed
-static void _sci1_dump_state(Sci1SongIterator *self) {
- int i;
-
- sciprintf("-- [%p] ------------------------\n", self);
- for (i = 0; i < self->_numChannels; i++) {
- int j;
- sciprintf("%d(s%02d): d-%d:\t(%x/%x) ",
- self->_channels[i].id,
- self->_channels[i].state,
- self->_channels[i].delay,
- self->_channels[i].offset,
- self->_channels[i].end);
- for (j = -3; j < 9; j++) {
- if (j == 0)
- sciprintf(">");
- else
- sciprintf(" ");
-
- sciprintf("%02x", self->_data[self->_channels[i].offset + j]);
-
- if (j == 0)
- sciprintf("<");
- else
- sciprintf(" ");
- }
- sciprintf("\n");
- }
- if (!self->_samples.empty()) {
- sciprintf("\t[sample %d]\n",
- self->_samples.begin()->delta);
- }
- sciprintf("------------------------------------------\n");
-}
-#endif
-
#define COMMAND_INDEX_NONE -1
#define COMMAND_INDEX_PCM -2
-static int _sci1_command_index(Sci1SongIterator *self) {
+int Sci1SongIterator::getCommandIndex() const {
/* Determine the channel # of the next active event, or -1 */
int i;
int base_delay = 0x7ffffff;
int best_chan = COMMAND_INDEX_NONE;
- for (i = 0; i < self->_numChannels; i++)
- if ((self->_channels[i].state != SI_STATE_PENDING)
- && (self->_channels[i].state != SI_STATE_FINISHED)) {
+ for (i = 0; i < _numChannels; i++)
+ if ((_channels[i].state != SI_STATE_PENDING)
+ && (_channels[i].state != SI_STATE_FINISHED)) {
- if ((self->_channels[i].state == SI_STATE_DELTA_TIME)
- && (self->_channels[i].delay == 0))
+ if ((_channels[i].state == SI_STATE_DELTA_TIME)
+ && (_channels[i].delay == 0))
return i;
/* First, read all unknown delta times */
- if (self->_channels[i].delay < base_delay) {
+ if (_channels[i].delay < base_delay) {
best_chan = i;
- base_delay = self->_channels[i].delay;
+ base_delay = _channels[i].delay;
}
}
- if (!self->_samples.empty() && base_delay >= self->_samples.begin()->delta)
+ if (!_samples.empty() && base_delay >= _samples.begin()->delta)
return COMMAND_INDEX_PCM;
return best_chan;
@@ -944,8 +891,6 @@
}
int Sci1SongIterator::nextCommand(byte *buf, int *result) {
- int retval = -42; /* Shouldn't happen, but gcc doesn't agree */
- int chan;
if (!_initialised) {
sciprintf("[iterator-1] DEBUG: Initialising for %d\n",
@@ -962,8 +907,9 @@
return delay;
}
- do {
- chan = _sci1_command_index(this);
+ int retval = 0;
+ while (retval > 0) { /* All delays must be processed separately */
+ int chan = getCommandIndex();
if (chan == COMMAND_INDEX_NONE) {
return SI_FINISHED;
@@ -979,7 +925,7 @@
int delay = _samples.begin()->delta;
if (delay) {
- _sci1_update_delta(this, delay);
+ updateDelta(delay);
return delay;
}
/* otherwise we're touching a PCM */
@@ -1015,11 +961,11 @@
#endif
} else if (retval > 0) {
int sd ;
- sd = _sci1_get_smallest_delta(this);
+ sd = getSmallestDelta();
- if (_sci1_no_delta_time(this) && sd) {
+ if (noDeltaTime() && sd) {
/* No other channel is ready */
- _sci1_update_delta(this, sd);
+ updateDelta(sd);
/* Only from here do we return delta times */
return sd;
@@ -1028,7 +974,7 @@
} /* Not a PCM */
- } while (retval > 0); /* All delays must be processed separately */
+ }
return retval;
}
@@ -1132,7 +1078,7 @@
}
default:
- warning(SIPFX "Unsupported command %d to SCI1 iterator", msg._type);
+ warning("Unsupported command %d to SCI1 iterator", msg._type);
}
return this;
}
@@ -1350,7 +1296,7 @@
int firstfree = 1; /* First free channel */
int incomplete_map = 0;
- morph_deferred = TEE_MORPH_NONE;
+ _readyToMorph = false;
_status = TEE_LEFT_ACTIVE | TEE_RIGHT_ACTIVE;
_children[TEE_LEFT].it = left;
@@ -1430,7 +1376,7 @@
/* None is active? */
return SI_FINISHED;
- if (morph_deferred == TEE_MORPH_READY)
+ if (_readyToMorph)
return SI_MORPH;
if ((_status & (TEE_LEFT_ACTIVE | TEE_RIGHT_ACTIVE))
@@ -1444,9 +1390,9 @@
which = TEE_LEFT;
else if (_status & TEE_RIGHT_ACTIVE)
which = TEE_RIGHT;
- memcpy(buf, _children[which].buf, MAX_BUF_SIZE);
+ memcpy(buf, _children[which].buf, sizeof(buf));
*result = _children[which].result;
- morph_deferred = TEE_MORPH_READY;
+ _readyToMorph = true;
return _children[which].retval;
}
@@ -1538,7 +1484,7 @@
}
_status &= ~ready_masks[retid];
- memcpy(buf, _children[retid].buf, MAX_BUF_SIZE);
+ memcpy(buf, _children[retid].buf, sizeof(buf));
*result = _children[retid].result;
return _children[retid].retval;
@@ -1694,11 +1640,11 @@
songit_tee_death_notification(_deathListeners[i], this);
}
-SongIterator *songit_new(byte *data, uint size, int type, songit_id_t id) {
+SongIterator *songit_new(byte *data, uint size, SongIteratorType type, songit_id_t id) {
BaseSongIterator *it;
if (!data || size < 22) {
- warning(SIPFX "Attempt to instantiate song iterator for null song data");
+ warning("Attempt to instantiate song iterator for null song data");
return NULL;
}
@@ -1714,7 +1660,7 @@
default:
/**-- Invalid/unsupported sound resources --**/
- warning(SIPFX "Attempt to instantiate invalid/unknown song iterator type %d", type);
+ warning("Attempt to instantiate invalid/unknown song iterator type %d", type);
return NULL;
}
Modified: scummvm/trunk/engines/sci/sfx/iterator.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/iterator.h 2009-05-12 23:31:55 UTC (rev 40517)
+++ scummvm/trunk/engines/sci/sfx/iterator.h 2009-05-12 23:32:32 UTC (rev 40518)
@@ -36,13 +36,15 @@
namespace Sci {
-#define SI_FINISHED -1 /* Song finished playing */
-#define SI_LOOP -2 /* Song just looped */
-#define SI_ABSOLUTE_CUE -3 /* Found a song cue (absolute) */
-#define SI_RELATIVE_CUE -4 /* Found a song cue (relative) */
-#define SI_PCM -5 /* Found a PCM */
-#define SI_IGNORE -6 /* This event got edited out by the remapper */
-#define SI_MORPH -255 /* Song iterator requested self-morph. */
+enum SongIteratorStatus {
+ SI_FINISHED = -1, /**< Song finished playing */
+ SI_LOOP = -2, /**< Song just looped */
+ SI_ABSOLUTE_CUE = -3, /**< Found a song cue (absolute) */
+ SI_RELATIVE_CUE = -4, /**< Found a song cue (relative) */
+ SI_PCM = -5, /**< Found a PCM */
+ SI_IGNORE = -6, /**< This event got edited out by the remapper */
+ SI_MORPH = -255 /**< Song iterator requested self-morph. */
+};
#define FADE_ACTION_NONE 0
#define FADE_ACTION_FADE_AND_STOP 1
@@ -55,8 +57,6 @@
int action;
};
-#define SONG_ITERATOR_MESSAGE_ARGUMENTS_NR 2
-
/* Helper defs for messages */
enum {
_SIMSG_BASE, /* Any base decoder */
@@ -232,8 +232,10 @@
/*-- Song iterator operations --*/
/********************************/
-#define SCI_SONG_ITERATOR_TYPE_SCI0 0
-#define SCI_SONG_ITERATOR_TYPE_SCI1 1
+enum SongIteratorType {
+ SCI_SONG_ITERATOR_TYPE_SCI0 = 0,
+ SCI_SONG_ITERATOR_TYPE_SCI1 = 1
+};
#define IT_READER_MASK_MIDI (1 << 0)
#define IT_READER_MASK_DELAY (1 << 1)
@@ -251,7 +253,7 @@
| IT_READER_MASK_CUE \
| IT_READER_MASK_PCM )
-int songit_next(SongIterator **it, unsigned char *buf, int *result, int mask);
+int songit_next(SongIterator **it, byte *buf, int *result, int mask);
/* Convenience wrapper around it->next
** Parameters: (SongIterator **it) Reference to the iterator to access
** (byte *) buf: The buffer to write to (needs to be able to
@@ -269,7 +271,7 @@
** or the number of loops remaining for SI_LOOP.
*/
-SongIterator *songit_new(unsigned char *data, uint size, int type, songit_id_t id);
+SongIterator *songit_new(byte *data, uint size, SongIteratorType type, songit_id_t id);
/* Constructs a new song iterator object
** Parameters: (byte *) data: The song data to iterate over
** (uint) size: Number of bytes in the song
Modified: scummvm/trunk/engines/sci/sfx/iterator_internal.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/iterator_internal.h 2009-05-12 23:31:55 UTC (rev 40517)
+++ scummvm/trunk/engines/sci/sfx/iterator_internal.h 2009-05-12 23:32:32 UTC (rev 40518)
@@ -36,12 +36,6 @@
/* Iterator types */
-#define SCI_SONG_ITERATOR_TYPE_SCI0 0
-#define SCI_SONG_ITERATOR_TYPE_SCI1 1
-
-#define SIPFX __FILE__" : "
-
-
enum {
SI_STATE_UNINITIALISED = -1,
SI_STATE_DELTA_TIME = 0, //!< Now at a delta time
@@ -80,6 +74,7 @@
byte last_cmd; //!< Last operation executed, for running status */
public:
+ void init(int id, int offset, int end);
void resetSynthChannels();
};
@@ -165,6 +160,17 @@
void init();
int getTimepos();
SongIterator *clone(int delta);
+
+private:
+ int getSmallestDelta() const;
+
+ void updateDelta(int delta);
+
+ /** Checks that none of the channels is waiting for its delta to be read */
+ bool noDeltaTime() const;
+
+ /** Determine the channel # of the next active event, or -1 */
+ int getCommandIndex() const;
};
#define PLAYMASK_NONE 0x0
@@ -173,6 +179,10 @@
/*--------- Fast Forward ---------*/
/**********************************/
+/**
+ * A song iterator which fast-forwards another iterator.
+ * Skips all delta times until a specified 'delta' has been used up.
+ */
class FastForwardSongIterator : public SongIterator {
protected:
SongIterator *_delegate;
@@ -194,8 +204,6 @@
/**********************************/
enum {
- MAX_BUF_SIZE = 4,
-
TEE_LEFT = 0,
TEE_RIGHT = 1,
TEE_LEFT_ACTIVE = (1<<0),
@@ -203,10 +211,7 @@
TEE_LEFT_READY = (1<<2), /**< left result is ready */
TEE_RIGHT_READY = (1<<3), /**< right result is ready */
TEE_LEFT_PCM = (1<<4),
- TEE_RIGHT_PCM = (1<<5),
-
- TEE_MORPH_NONE = 0, /**< Not waiting to self-morph */
- TEE_MORPH_READY = 1 /**< Ready to self-morph */
+ TEE_RIGHT_PCM = (1<<5)
};
/**
@@ -216,11 +221,11 @@
public:
int _status;
- int morph_deferred; /* One of TEE_MORPH_* above */
+ bool _readyToMorph; /* One of TEE_MORPH_* above */
struct {
SongIterator *it;
- byte buf[MAX_BUF_SIZE];
+ byte buf[4];
int result;
int retval;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list