From 53718a5ca00f95150f1c0700efa949d19d83410a Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Wed, 2 Dec 2015 05:18:43 -0800
Subject: [PATCH] Use a typedef for the sound instance handle

---
 apps/openmw/mwsound/sound.hpp        | 4 ++--
 apps/openmw/mwsound/sound_output.hpp | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwsound/sound.hpp b/apps/openmw/mwsound/sound.hpp
index 0ae465cfb..878384b43 100644
--- a/apps/openmw/mwsound/sound.hpp
+++ b/apps/openmw/mwsound/sound.hpp
@@ -1,7 +1,7 @@
 #ifndef GAME_SOUND_SOUND_H
 #define GAME_SOUND_SOUND_H
 
-#include "soundmanagerimp.hpp"
+#include "sound_output.hpp"
 
 namespace MWSound
 {
@@ -20,7 +20,7 @@ namespace MWSound
         float mFadeOutTime;
 
     protected:
-        void *mHandle;
+        Sound_Instance mHandle;
 
         friend class Sound_Output;
         friend class OpenAL_Output;
diff --git a/apps/openmw/mwsound/sound_output.hpp b/apps/openmw/mwsound/sound_output.hpp
index 9cc02160b..d879dbf44 100644
--- a/apps/openmw/mwsound/sound_output.hpp
+++ b/apps/openmw/mwsound/sound_output.hpp
@@ -3,11 +3,10 @@
 
 #include <string>
 #include <memory>
+#include <vector>
 
 #include "soundmanagerimp.hpp"
 
-#include "../mwworld/ptr.hpp"
-
 namespace MWSound
 {
     class SoundManager;
@@ -17,6 +16,8 @@ namespace MWSound
 
     // An opaque handle for the implementation's sound buffers.
     typedef void *Sound_Handle;
+    // An opaque handle for the implementation's sound instances.
+    typedef void *Sound_Instance;
 
     class Sound_Output
     {