aboutsummaryrefslogtreecommitdiff
path: root/sound/audiocd.h
diff options
context:
space:
mode:
authorMax Horn2006-10-21 12:44:10 +0000
committerMax Horn2006-10-21 12:44:10 +0000
commit9edf1e6a1a95f45b9883e298edc7e578ff9495d1 (patch)
tree897a46c0e4bbc22c8422bd3b96545bfeea3a4a0f /sound/audiocd.h
parent86d3f30347d5ee7ee67a4f16d5043b9bef0539db (diff)
downloadscummvm-rg350-9edf1e6a1a95f45b9883e298edc7e578ff9495d1.tar.gz
scummvm-rg350-9edf1e6a1a95f45b9883e298edc7e578ff9495d1.tar.bz2
scummvm-rg350-9edf1e6a1a95f45b9883e298edc7e578ff9495d1.zip
cleanup
svn-id: r24407
Diffstat (limited to 'sound/audiocd.h')
-rw-r--r--sound/audiocd.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/audiocd.h b/sound/audiocd.h
index 2083ffdf39..837edcff82 100644
--- a/sound/audiocd.h
+++ b/sound/audiocd.h
@@ -31,9 +31,10 @@
namespace Audio {
+
class DigitalTrackInfo {
public:
- virtual void play(Audio::Mixer *mixer, Audio::SoundHandle *handle, int startFrame, int duration) = 0;
+ virtual void play(Mixer *mixer, SoundHandle *handle, int startFrame, int duration) = 0;
virtual ~DigitalTrackInfo() { }
};
@@ -65,7 +66,7 @@ private:
private:
/* used for emulated CD music */
struct ExtStatus : Status {
- Audio::SoundHandle handle;
+ SoundHandle handle;
};
ExtStatus _cd;
@@ -81,6 +82,7 @@ private:
DigitalTrackInfo *_trackInfo[CACHE_TRACKS];
int _currentCache;
+ Mixer *_mixer;
};
/** Shortcut for accessing the audio CD manager. */