[Scummvm-cvs-logs] SF.net SVN: scummvm:[39119] scummvm/trunk/engines/sci/sfx/player/polled.cpp

[fingolfin at users.sourceforge.net]

Revision: 39119
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39119&view=rev
Author:   fingolfin
Date:     2009-03-04 08:04:28 +0000 (Wed, 04 Mar 2009)

Log Message:
-----------
SCI: Removed unused FEED_MODE_DEAD, extended FIXME comment for FEED_MODE_RESTART

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sfx/player/polled.cpp

Modified: scummvm/trunk/engines/sci/sfx/player/polled.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/player/polled.cpp	2009-03-04 07:59:33 UTC (rev 39118)
+++ scummvm/trunk/engines/sci/sfx/player/polled.cpp	2009-03-04 08:04:28 UTC (rev 39119)
@@ -57,7 +57,6 @@
 	enum FeedMode {
 		FEED_MODE_ALIVE,
 		FEED_MODE_IDLE,
-		FEED_MODE_DEAD,
 		FEED_MODE_RESTART
 	};
 
@@ -90,7 +89,7 @@
 	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 @@
 			//  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 @@
 		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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.