diff options
Diffstat (limited to 'source/gameengine/Ketsji/KX_CDActuator.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_CDActuator.cpp | 86 |
1 files changed, 10 insertions, 76 deletions
diff --git a/source/gameengine/Ketsji/KX_CDActuator.cpp b/source/gameengine/Ketsji/KX_CDActuator.cpp index bfca81f45d9..0861a54d848 100644 --- a/source/gameengine/Ketsji/KX_CDActuator.cpp +++ b/source/gameengine/Ketsji/KX_CDActuator.cpp @@ -31,9 +31,7 @@ */ #include "KX_CDActuator.h" -#include "SND_CDObject.h" #include "KX_GameObject.h" -#include "SND_Scene.h" // needed for replication #include <iostream> #ifdef HAVE_CONFIG_H @@ -44,21 +42,18 @@ /* Native functions */ /* ------------------------------------------------------------------------- */ KX_CDActuator::KX_CDActuator(SCA_IObject* gameobject, - SND_Scene* soundscene, KX_CDACT_TYPE type, int track, short start, short end) : SCA_IActuator(gameobject) { - m_soundscene = soundscene; m_type = type; m_track = track; m_lastEvent = true; m_isplaying = false; m_startFrame = start; m_endFrame = end; - m_gain = SND_CDObject::Instance()->GetGain(); } @@ -82,60 +77,13 @@ bool KX_CDActuator::Update() { bool result = false; bool bNegativeEvent = IsNegativeEvent(); - + RemoveAllEvents(); - + if (!bNegativeEvent) { switch (m_type) { - case KX_CDACT_PLAY_ALL: - { - SND_CDObject::Instance()->SetPlaymode(SND_CD_ALL); - SND_CDObject::Instance()->SetTrack(1); - SND_CDObject::Instance()->SetPlaystate(SND_MUST_PLAY); - //result = true; - break; - } - case KX_CDACT_PLAY_TRACK: - { - SND_CDObject::Instance()->SetPlaymode(SND_CD_TRACK); - SND_CDObject::Instance()->SetTrack(m_track); - SND_CDObject::Instance()->SetPlaystate(SND_MUST_PLAY); - //result = true; - break; - } - case KX_CDACT_LOOP_TRACK: - { - SND_CDObject::Instance()->SetPlaymode(SND_CD_ALL); - SND_CDObject::Instance()->SetTrack(m_track); - SND_CDObject::Instance()->SetPlaystate(SND_MUST_PLAY); - //result = true; - break; - } - case KX_CDACT_STOP: - { - SND_CDObject::Instance()->SetPlaystate(SND_MUST_STOP); - break; - } - case KX_CDACT_PAUSE: - { - SND_CDObject::Instance()->SetPlaystate(SND_MUST_PAUSE); - //result = true; - break; - } - case KX_CDACT_RESUME: - { - SND_CDObject::Instance()->SetPlaystate(SND_MUST_RESUME); - //result = true; - break; - } - case KX_CDACT_VOLUME: - { - SND_CDObject::Instance()->SetGain(m_gain); - //result = true; - break; - } default: // implement me !! break; @@ -196,7 +144,6 @@ PyMethodDef KX_CDActuator::Methods[] = { }; PyAttributeDef KX_CDActuator::Attributes[] = { - KX_PYATTRIBUTE_FLOAT_RW_CHECK("volume", 0.0, 1.0, KX_CDActuator, m_gain,pyattr_setGain), KX_PYATTRIBUTE_INT_RW("track", 1, 99, false, KX_CDActuator, m_track), { NULL } //Sentinel }; @@ -204,7 +151,6 @@ PyAttributeDef KX_CDActuator::Attributes[] = { int KX_CDActuator::pyattr_setGain(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) { KX_CDActuator* act = static_cast<KX_CDActuator*>(self); - SND_CDObject::Instance()->SetGain(act->m_gain); return PY_SET_ATTR_SUCCESS; } @@ -212,34 +158,30 @@ KX_PYMETHODDEF_DOC_NOARGS(KX_CDActuator, startCD, "startCD()\n" "\tStarts the CD playing.\n") { - SND_CDObject::Instance()->SetPlaystate(SND_MUST_PLAY); Py_RETURN_NONE; -} +} KX_PYMETHODDEF_DOC_NOARGS(KX_CDActuator, pauseCD, "pauseCD()\n" "\tPauses the CD playing.\n") { - SND_CDObject::Instance()->SetPlaystate(SND_MUST_PAUSE); Py_RETURN_NONE; -} +} KX_PYMETHODDEF_DOC_NOARGS(KX_CDActuator, resumeCD, "resumeCD()\n" "\tResumes the CD playing.\n") { - SND_CDObject::Instance()->SetPlaystate(SND_MUST_RESUME); Py_RETURN_NONE; -} +} KX_PYMETHODDEF_DOC_NOARGS(KX_CDActuator, stopCD, "stopCD()\n" "\tStops the CD playing.\n") { - SND_CDObject::Instance()->SetPlaystate(SND_MUST_STOP); Py_RETURN_NONE; } @@ -250,9 +192,6 @@ KX_PYMETHODDEF_DOC_O(KX_CDActuator, playTrack, { if (PyLong_Check(value)) { int track = PyLong_AsSsize_t(value); - SND_CDObject::Instance()->SetPlaymode(SND_CD_TRACK); - SND_CDObject::Instance()->SetTrack(track); - SND_CDObject::Instance()->SetPlaystate(SND_MUST_PLAY); } Py_RETURN_NONE; } @@ -263,11 +202,8 @@ KX_PYMETHODDEF_DOC_NOARGS(KX_CDActuator, playAll, "playAll()\n" "\tPlays the CD from the beginning.\n") { - SND_CDObject::Instance()->SetPlaymode(SND_CD_ALL); - SND_CDObject::Instance()->SetTrack(1); - SND_CDObject::Instance()->SetPlaystate(SND_MUST_PLAY); Py_RETURN_NONE; -} +} // Deprecated -----> PyObject* KX_CDActuator::PySetGain(PyObject* args) @@ -276,20 +212,18 @@ PyObject* KX_CDActuator::PySetGain(PyObject* args) ShowDeprecationWarning("setGain()", "the volume property"); if (!PyArg_ParseTuple(args, "f:setGain", &gain)) return NULL; - - SND_CDObject::Instance()->SetGain(gain); - + Py_RETURN_NONE; -} +} PyObject* KX_CDActuator::PyGetGain(PyObject* args) { - float gain = SND_CDObject::Instance()->GetGain(); + float gain = 1.0; ShowDeprecationWarning("getGain()", "the volume property"); PyObject* result = PyFloat_FromDouble(gain); - + return result; } // <----- |