[Scummvm-cvs-logs] SF.net SVN: scummvm:[45676] scummvm/trunk/engines/sci

[thebluegr at users.sourceforge.net]

Revision: 45676
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45676&view=rev
Author:   thebluegr
Date:     2009-11-05 00:04:53 +0000 (Thu, 05 Nov 2009)

Log Message:
-----------
Moved the audio related command enums inside audio.h

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/ksound.cpp
    scummvm/trunk/engines/sci/sfx/audio.h

Modified: scummvm/trunk/engines/sci/engine/ksound.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/ksound.cpp	2009-11-04 22:54:14 UTC (rev 45675)
+++ scummvm/trunk/engines/sci/engine/ksound.cpp	2009-11-05 00:04:53 UTC (rev 45676)
@@ -100,26 +100,6 @@
 	_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

Modified: scummvm/trunk/engines/sci/sfx/audio.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/audio.h	2009-11-04 22:54:14 UTC (rev 45675)
+++ scummvm/trunk/engines/sci/sfx/audio.h	2009-11-05 00:04:53 UTC (rev 45676)
@@ -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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.