Cleanup.

svn-id: r31210

1 files changed, 7 insertions, 8 deletions

diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h
index 7c3bce38bc..1970daa2e2 100644
--- a/engines/kyra/sound.h
+++ b/engines/kyra/sound.h
@@ -185,6 +185,12 @@ protected:
 	enum {
 		kNumChannelHandles = 4
 	};
+	
+	struct SoundChannel {
+		Common::String file;
+		Audio::SoundHandle channelHandle;
+	};
+	SoundChannel _soundChannels[kNumChannelHandles];
 
 	int _musicEnabled;
 	bool _sfxEnabled;
@@ -197,12 +203,6 @@ protected:
 private:
 	const AudioDataStruct *_soundDataList;
 
-	struct SoundChannel {
-		Common::String file;
-		Audio::SoundHandle channelHandle;
-	};
-	SoundChannel _soundChannels[kNumChannelHandles];
-
 	struct SpeechCodecs {
 		const char *fileext;
 		Audio::AudioStream *(*streamFunc)(
@@ -428,14 +428,13 @@ public:
 	void haltTrack();
 	void beginFadeOut();
 
-	void voicePlay(const char *file);
+	bool voicePlay(const char *file);
 	void playSoundEffect(uint8) {}
 
 private:
 	int _lastTrack;
 
 	Audio::AudioStream *_currentSFX;
-	Audio::SoundHandle _sfxHandles[kNumChannelHandles];
 
 	//SoundTowns_v2_TwnDriver *_driver;
 	uint8 *_twnTrackData;