reorg/clenup, changed main loop in smush code

svn-id: r6817

1 files changed, 166 insertions, 0 deletions

diff --git a/scumm/smush/smush_mixer.cpp b/scumm/smush/smush_mixer.cpp
new file mode 100644
index 0000000000..c7ed4708b6
--- /dev/null
+++ b/scumm/smush/smush_mixer.cpp
@@ -0,0 +1,166 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2002-2003 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * $Header$
+ *
+ */
+
+#include <stdafx.h>
+#include "common/util.h"
+#include "smush_mixer.h"
+#include "channel.h"
+#include "sound/mixer.h"
+#include "scumm/scumm.h"
+#include "scumm/sound.h"
+#include "scumm/imuse.h"
+
+SmushMixer::SmushMixer(SoundMixer *m) :
+	_mixer(m),
+	_soundFrequency(22050),
+	_nextIndex(_mixer->_beginSlots)	{
+	for(int32 i = _mixer->_beginSlots; i < SoundMixer::NUM_CHANNELS; i++) {
+		_channels[i].id = -1;
+		_channels[i].chan = NULL;
+		_channels[i].first = true;
+	}
+}
+
+SmushMixer::~SmushMixer() {
+}
+
+SmushChannel *SmushMixer::findChannel(int32 track) {
+	debug(9, "SmushMixer::findChannel(%d)", track);
+	for(int32 i = _mixer->_beginSlots; i < SoundMixer::NUM_CHANNELS; i++) {
+		if(_channels[i].id == track)
+			return _channels[i].chan;
+	}
+	return NULL;
+}
+
+bool SmushMixer::addChannel(SmushChannel *c) {
+	int32 track = c->getTrackIdentifier();
+	int i;
+
+	debug(9, "SmushMixer::addChannel(%d)", track);
+
+	for(i = _mixer->_beginSlots; i < SoundMixer::NUM_CHANNELS; i++) {
+		if(_channels[i].id == track)
+			warning("SmushMixer::addChannel(%d) : channel already exist !", track);
+	}
+	if(_nextIndex >= SoundMixer::NUM_CHANNELS)
+		_nextIndex = _mixer->_beginSlots;
+
+	for(i = _nextIndex; i < SoundMixer::NUM_CHANNELS; i++) {
+		if(_channels[i].chan == NULL || _channels[i].id == -1) {
+			_channels[i].chan = c;
+			_channels[i].id = track;
+			_channels[i].first = true;
+			_nextIndex = i + 1;
+			return true;
+		}
+	}
+
+	for(i = _mixer->_beginSlots; i < _nextIndex; i++) {
+		if(_channels[i].chan == NULL || _channels[i].id == -1)	{
+			_channels[i].chan = c;
+			_channels[i].id = track;
+			_channels[i].first = true;
+			_nextIndex = i + 1;
+			return true;
+		}
+	}
+
+	warning("_nextIndex == %d\n", _nextIndex);
+
+	for(i = _mixer->_beginSlots; i < SoundMixer::NUM_CHANNELS; i++) {
+		warning("channel %d : %p(%d, %d) %d %d\n", i, (void *)_channels[i].chan, 
+			_channels[i].chan ? _channels[i].chan->getTrackIdentifier() : -1, 
+			_channels[i].chan ? _channels[i].chan->isTerminated() : 1, 
+			_channels[i].first, _channels[i].mixer_index);
+	}
+
+	error("SmushMixer::add_channel() : no more channel available");
+	return false;
+}
+
+bool SmushMixer::handleFrame() {
+	debug(9, "SmushMixer::handleFrame()");
+	for(int i = _mixer->_beginSlots; i < SoundMixer::NUM_CHANNELS; i++) {
+		if(_channels[i].id != -1) {
+			if(_channels[i].chan->isTerminated()) {
+				delete _channels[i].chan;
+				_channels[i].id = -1;
+				_channels[i].chan = NULL;
+			} else {
+				int32 rate;
+				bool stereo, is_short;
+
+				_channels[i].chan->getParameters(rate, stereo, is_short);
+				int32 size = _channels[i].chan->availableSoundData();
+				int32 flags = stereo ? SoundMixer::FLAG_STEREO : 0;
+
+				if(is_short) {
+					short *data = new int16[size * (stereo ? 2 : 1) * 2];
+					_channels[i].chan->getSoundData(data, size);
+					if(_channels[i].chan->getRate() == 11025) size *= 2;
+					size *= stereo ? 4 : 2;
+
+					if(_silentMixer == false) {
+						if(_channels[i].first) {
+							_channels[i].mixer_index = _mixer->playStream(NULL, -1, data, size, rate, flags | SoundMixer::FLAG_16BITS);
+							_channels[i].first = false;
+						} else {
+							_mixer->append(_channels[i].mixer_index, data, size, rate, flags | SoundMixer::FLAG_16BITS);
+						}
+					}
+
+					delete []data;
+				} else {
+					int8 *data = new int8[size * (stereo ? 2 : 1) * 2];
+					_channels[i].chan->getSoundData(data, size);
+					if(_channels[i].chan->getRate() == 11025) size *= 2;
+					size *= stereo ? 2 : 1;
+
+					if(_silentMixer == false) {
+						if(_channels[i].first) {
+							_channels[i].mixer_index = _mixer->playStream(NULL, -1, data, size, rate, flags | SoundMixer::FLAG_UNSIGNED);
+							_channels[i].first = false;
+						} else {
+							_mixer->append(_channels[i].mixer_index, data, size, rate, flags | SoundMixer::FLAG_UNSIGNED);
+						}
+					}
+
+					delete []data;
+				}
+			}
+		}
+	}
+	return true;
+}
+
+bool SmushMixer::stop() {
+	debug(9, "SmushMixer::stop()");
+	for(int i = _mixer->_beginSlots; i < SoundMixer::NUM_CHANNELS; i++) {
+		if(_channels[i].id != -1) {
+			delete _channels[i].chan;
+			_channels[i].id = -1;
+			_channels[i].chan = NULL;
+		}
+	}
+	return true;
+}
+