libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-30 07:23:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Removed unused FEED_MODE_DEAD, extended FIXME comment for FEED_MODE_RESTART

Browse Source 
svn-id: r39119
This commit is contained in:
Max Horn 2009-03-04 08:04:28 +00:00
parent dbb59ce3a1
commit 2a7eef19c0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engines/sci/sfx/player/polled.cpp
View File

@ -57,7 +57,6 @@ protected:
enum FeedMode {
FEED_MODE_ALIVE,
FEED_MODE_IDLE,
FEED_MODE_DEAD,
FEED_MODE_RESTART
};
@ -90,7 +89,7 @@ public:
virtual bool isStereo() const { return _conf.stereo; }
virtual int getRate() const { return _conf.rate; }
virtual bool endOfData() const { return _mode == FEED_MODE_DEAD; }
virtual bool endOfData() const { return false; }
protected:
void queryTimestamp();
@ -121,7 +120,9 @@ void PolledPlayerAudioStream::queryTimestamp() {
// I may have added this as a workaround for not being able to come
// up with a convenient way to implement mixer->pause() and mixer->resume()
// on DC."
// That makes some sense.
// That makes some sense. However, maybe it is sufficient to just
// go to FEED_MODE_ALIVE ? With the current code, the player will
// permanently get stuck in FEED_MODE_RESTART if we ever get here...
_mode = FEED_MODE_RESTART;
_time = Audio::Timestamp(g_system->getMillis(), _conf.rate);
_gap = stamp.frameDiff(_time);
@ -163,7 +164,7 @@ int PolledPlayerAudioStream::readBuffer(int16 *buffer, const int numSamples) {
if (_mode == FEED_MODE_IDLE)
queryTimestamp();
if (_mode == FEED_MODE_IDLE || _mode == FEED_MODE_DEAD) {
if (_mode == FEED_MODE_IDLE) {
memset(buf_pos, 0, frames_left * channels * 2);
_time = _time.addFrames(frames_left);