Use a typedef for the sound instance handle

openmw-38
Chris Robinson 9 years ago
parent 3a39a92b93
commit 53718a5ca0

@ -1,7 +1,7 @@
#ifndef GAME_SOUND_SOUND_H #ifndef GAME_SOUND_SOUND_H
#define GAME_SOUND_SOUND_H #define GAME_SOUND_SOUND_H
#include "soundmanagerimp.hpp" #include "sound_output.hpp"
namespace MWSound namespace MWSound
{ {
@ -20,7 +20,7 @@ namespace MWSound
float mFadeOutTime; float mFadeOutTime;
protected: protected:
void *mHandle; Sound_Instance mHandle;
friend class Sound_Output; friend class Sound_Output;
friend class OpenAL_Output; friend class OpenAL_Output;

@ -3,11 +3,10 @@
#include <string> #include <string>
#include <memory> #include <memory>
#include <vector>
#include "soundmanagerimp.hpp" #include "soundmanagerimp.hpp"
#include "../mwworld/ptr.hpp"
namespace MWSound namespace MWSound
{ {
class SoundManager; class SoundManager;
@ -17,6 +16,8 @@ namespace MWSound
// An opaque handle for the implementation's sound buffers. // An opaque handle for the implementation's sound buffers.
typedef void *Sound_Handle; typedef void *Sound_Handle;
// An opaque handle for the implementation's sound instances.
typedef void *Sound_Instance;
class Sound_Output class Sound_Output
{ {

Loading…
Cancel
Save