cleanup; some more fixed need afnow that the premix proc is expected to generate stereo data; (we probably should add a common base class for Player_V1/V2 instead of deriving V1 from V2)

svn-id: r10312

1 files changed, 8 insertions, 7 deletions

diff --git a/scumm/player_v1.h b/scumm/player_v1.h
index 9adada0097..238e914999 100644
--- a/scumm/player_v1.h
+++ b/scumm/player_v1.h
@@ -53,24 +53,25 @@ public:
 	int  getMusicTimer() const;
 
 protected:
+	virtual void nextTick();
+	virtual void clear_channel(int i);
+	virtual void chainSound(int nr, byte *data);
+
+	virtual void generateSpkSamples(int16 *data, uint len);
+	virtual void generatePCjrSamples(int16 *data, uint len);
+
 	void restartSound();
 	void next_speaker_cmd(ChannelInfo *channel);
-	void clear_channel(int i);
-	void chainSound(int nr, byte *data);
-
-	void do_mix(int16 *buf, uint len);
 
 	void set_mplex(uint mplex);
 	void parseSpeakerChunk();
 	void nextSpeakerCmd();
 	void parsePCjrChunk();
 	void nextPCjrCmd();
-	void generateSpkSamples(int16 *data, uint len);
-	void generatePCjrSamples(int16 *data, uint len);
 
+private:
 	channel_data_v1 _channels[4];
 
-private:
 	byte *_next_chunk;
 	byte *_repeat_chunk;
 	uint  _chunk_type;