From 1f49679db5256221958bd336f47616a14b28b10f Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 5 Nov 2009 00:04:53 +0000
Subject: Moved the audio related command enums inside audio.h

svn-id: r45676
---
 engines/sci/engine/ksound.cpp | 20 --------------------
 engines/sci/sfx/audio.h       | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'engines/sci')

diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp
index 651a02d8ba..9e38799156 100644
--- a/engines/sci/engine/ksound.cpp
+++ b/engines/sci/engine/ksound.cpp
@@ -100,26 +100,6 @@ enum {
 	_K_SCI1_SOUND_UPDATE_VOL_PRI = 20
 };
 
-enum AudioCommands {
-	// TODO: find the difference between kSci1AudioWPlay and kSci1AudioPlay
-	kSciAudioWPlay = 1, /* Plays an audio stream */
-	kSciAudioPlay = 2, /* Plays an audio stream */
-	kSciAudioStop = 3, /* Stops an audio stream */
-	kSciAudioPause = 4, /* Pauses an audio stream */
-	kSciAudioResume = 5, /* Resumes an audio stream */
-	kSciAudioPosition = 6, /* Return current position in audio stream */
-	kSciAudioRate = 7, /* Return audio rate */
-	kSciAudioVolume = 8, /* Return audio volume */
-	kSciAudioLanguage = 9, /* Return audio language */
-	kSciAudioCD = 10 /* Plays SCI1.1 CD audio */
-};
-
-enum AudioSyncCommands {
-	kSciAudioSyncStart = 0,
-	kSciAudioSyncNext = 1,
-	kSciAudioSyncStop = 2
-};
-
 #define SCI1_SOUND_FLAG_MAY_PAUSE        1 /* Only here for completeness; The interpreter doesn't touch this bit */
 #define SCI1_SOUND_FLAG_SCRIPTED_PRI     2 /* but does touch this */
 //#define DEBUG_SOUND	// enable for sound debugging
diff --git a/engines/sci/sfx/audio.h b/engines/sci/sfx/audio.h
index c076a96eff..82b5896499 100644
--- a/engines/sci/sfx/audio.h
+++ b/engines/sci/sfx/audio.h
@@ -31,6 +31,26 @@
 
 namespace Sci {
 
+enum AudioCommands {
+	// TODO: find the difference between kSci1AudioWPlay and kSci1AudioPlay
+	kSciAudioWPlay = 1, /* Plays an audio stream */
+	kSciAudioPlay = 2, /* Plays an audio stream */
+	kSciAudioStop = 3, /* Stops an audio stream */
+	kSciAudioPause = 4, /* Pauses an audio stream */
+	kSciAudioResume = 5, /* Resumes an audio stream */
+	kSciAudioPosition = 6, /* Return current position in audio stream */
+	kSciAudioRate = 7, /* Return audio rate */
+	kSciAudioVolume = 8, /* Return audio volume */
+	kSciAudioLanguage = 9, /* Return audio language */
+	kSciAudioCD = 10 /* Plays SCI1.1 CD audio */
+};
+
+enum AudioSyncCommands {
+	kSciAudioSyncStart = 0,
+	kSciAudioSyncNext = 1,
+	kSciAudioSyncStop = 2
+};
+
 class Resource;
 class ResourceId;
 class ResourceManager;
-- 
cgit v1.2.3