Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Müller <nexyon@gmail.com>2014-03-04 02:57:59 +0400
committerJörg Müller <nexyon@gmail.com>2015-07-28 15:01:52 +0300
commit96dd213e7ecabeffc682aee40b4102296ab062de (patch)
treeab07e2786bcd81b137c40f8ce2084ccec62075e6 /source/gameengine/Ketsji/KX_SoundActuator.h
parentd3acfa1d87ccc7932b61311b7084951dcce67eba (diff)
Audaspace: preparing to use standalone library.
- Renamed some functions. - Using C API instead of C++ in the game engine, as the standalone is C++11.
Diffstat (limited to 'source/gameengine/Ketsji/KX_SoundActuator.h')
-rw-r--r--source/gameengine/Ketsji/KX_SoundActuator.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/source/gameengine/Ketsji/KX_SoundActuator.h b/source/gameengine/Ketsji/KX_SoundActuator.h
index 68eff56797b..bd7b28680f6 100644
--- a/source/gameengine/Ketsji/KX_SoundActuator.h
+++ b/source/gameengine/Ketsji/KX_SoundActuator.h
@@ -36,9 +36,6 @@
#ifdef WITH_AUDASPACE
# include "AUD_C-API.h"
-# include "AUD_IFactory.h"
-# include "AUD_IHandle.h"
-# include <boost/shared_ptr.hpp>
#endif
#include "BKE_sound.h"
@@ -58,12 +55,12 @@ class KX_SoundActuator : public SCA_IActuator
{
Py_Header
bool m_isplaying;
- boost::shared_ptr<AUD_IFactory> m_sound;
+ AUD_Sound* m_sound;
float m_volume;
float m_pitch;
bool m_is3d;
KX_3DSoundSettings m_3d;
- boost::shared_ptr<AUD_IHandle> m_handle;
+ AUD_Handle* m_handle;
void play();
@@ -84,7 +81,7 @@ public:
KX_SOUNDACT_TYPE m_type;
KX_SoundActuator(SCA_IObject* gameobj,
- boost::shared_ptr<AUD_IFactory> sound,
+ AUD_Sound *sound,
float volume,
float pitch,
bool is3d,