From 1a615346abab8f234c3dbd1c55e78b179bca9d87 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 10 May 2005 23:48:48 +0000
Subject: Moved class SoundMixer to Audio::Mixer (didn't call the namespace
 'Sound' because we already have many classes with that name)

svn-id: r18039
---
 sound/vorbis.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sound/vorbis.cpp')

diff --git a/sound/vorbis.cpp b/sound/vorbis.cpp
index f2f7781220..a92867b660 100644
--- a/sound/vorbis.cpp
+++ b/sound/vorbis.cpp
@@ -52,7 +52,7 @@ public:
 	~VorbisTrackInfo();
 	bool openTrack();
 	bool error() { return _error_flag; }
-	void play(SoundMixer *mixer, SoundHandle *handle, int startFrame, int duration);
+	void play(Audio::Mixer *mixer, SoundHandle *handle, int startFrame, int duration);
 };
 
 
@@ -168,7 +168,7 @@ VorbisTrackInfo::~VorbisTrackInfo() {
 #define VORBIS_TREMOR
 #endif
 
-void VorbisTrackInfo::play(SoundMixer *mixer, SoundHandle *handle, int startFrame, int duration) {
+void VorbisTrackInfo::play(Audio::Mixer *mixer, SoundHandle *handle, int startFrame, int duration) {
 
 	bool err = openTrack();
 	assert(!err);
@@ -180,7 +180,7 @@ void VorbisTrackInfo::play(SoundMixer *mixer, SoundHandle *handle, int startFram
 #endif
 
 	AudioStream *input = makeVorbisStream(&_ov_file, duration * ov_info(&_ov_file, -1)->rate / 75);
-	mixer->playInputStream(SoundMixer::kMusicSoundType, handle, input);
+	mixer->playInputStream(Audio::Mixer::kMusicSoundType, handle, input);
 }
 
 DigitalTrackInfo *getVorbisTrack(int track) {
-- 
cgit v1.2.3