diff options
author | Jörg Müller <nexyon@gmail.com> | 2020-05-03 16:25:52 +0300 |
---|---|---|
committer | Jörg Müller <nexyon@gmail.com> | 2020-05-03 16:30:35 +0300 |
commit | fe891d581dfece13b42414ba1d8fec6063290a31 (patch) | |
tree | f637697a4b96c5a9522d61fc500eba64a623fa19 /extern/audaspace/bindings/python | |
parent | 2b7d5caae8a1f00a137247af819529ed5e8d0200 (diff) |
Audaspace: update from upstream
- Changing API for time values from float to double for better precision.
- Fixing minor mistakes in the documentation.
- Fixing minor unnecessary large memory allocation.
Diffstat (limited to 'extern/audaspace/bindings/python')
-rw-r--r-- | extern/audaspace/bindings/python/PyDynamicMusic.cpp | 6 | ||||
-rw-r--r-- | extern/audaspace/bindings/python/PyHandle.cpp | 6 | ||||
-rw-r--r-- | extern/audaspace/bindings/python/PySequence.cpp | 14 | ||||
-rw-r--r-- | extern/audaspace/bindings/python/PySequenceEntry.cpp | 10 | ||||
-rw-r--r-- | extern/audaspace/bindings/python/PySound.cpp | 9 |
5 files changed, 23 insertions, 22 deletions
diff --git a/extern/audaspace/bindings/python/PyDynamicMusic.cpp b/extern/audaspace/bindings/python/PyDynamicMusic.cpp index cab856359e0..8a7d8265bf4 100644 --- a/extern/audaspace/bindings/python/PyDynamicMusic.cpp +++ b/extern/audaspace/bindings/python/PyDynamicMusic.cpp @@ -228,9 +228,9 @@ PyDoc_STRVAR(M_aud_DynamicMusic_position_doc, static int DynamicMusic_set_position(DynamicMusicP* self, PyObject* args, void* nothing) { - float position; + double position; - if(!PyArg_Parse(args, "f:position", &position)) + if(!PyArg_Parse(args, "d:position", &position)) return -1; try @@ -252,7 +252,7 @@ DynamicMusic_get_position(DynamicMusicP* self, void* nothing) { try { - return Py_BuildValue("f", (*reinterpret_cast<std::shared_ptr<aud::DynamicMusic>*>(self->dynamicMusic))->getPosition()); + return Py_BuildValue("d", (*reinterpret_cast<std::shared_ptr<aud::DynamicMusic>*>(self->dynamicMusic))->getPosition()); } catch(aud::Exception& e) { diff --git a/extern/audaspace/bindings/python/PyHandle.cpp b/extern/audaspace/bindings/python/PyHandle.cpp index 828c1b1afef..4ecf2ffd210 100644 --- a/extern/audaspace/bindings/python/PyHandle.cpp +++ b/extern/audaspace/bindings/python/PyHandle.cpp @@ -696,7 +696,7 @@ Handle_get_position(Handle* self, void* nothing) { try { - return Py_BuildValue("f", (*reinterpret_cast<std::shared_ptr<IHandle>*>(self->handle))->getPosition()); + return Py_BuildValue("d", (*reinterpret_cast<std::shared_ptr<IHandle>*>(self->handle))->getPosition()); } catch(Exception& e) { @@ -708,9 +708,9 @@ Handle_get_position(Handle* self, void* nothing) static int Handle_set_position(Handle* self, PyObject* args, void* nothing) { - float position; + double position; - if(!PyArg_Parse(args, "f:position", &position)) + if(!PyArg_Parse(args, "d:position", &position)) return -1; try diff --git a/extern/audaspace/bindings/python/PySequence.cpp b/extern/audaspace/bindings/python/PySequence.cpp index 2e08059cefb..26f0c9e566f 100644 --- a/extern/audaspace/bindings/python/PySequence.cpp +++ b/extern/audaspace/bindings/python/PySequence.cpp @@ -104,11 +104,11 @@ PyDoc_STRVAR(M_aud_Sequence_add_doc, " :arg sound: The sound this entry should play.\n" " :type sound: :class:`Sound`\n" " :arg begin: The start time.\n" - " :type begin: float\n" + " :type begin: double\n" " :arg end: The end time or a negative value if determined by the sound.\n" - " :type end: float\n" + " :type end: double\n" " :arg skip: How much seconds should be skipped at the beginning.\n" - " :type skip: float\n" + " :type skip: double\n" " :return: The entry added.\n" " :rtype: :class:`SequenceEntry`"); @@ -116,13 +116,13 @@ static PyObject * Sequence_add(Sequence* self, PyObject* args, PyObject* kwds) { PyObject* object; - float begin; - float end = -1.0f; - float skip = 0.0f; + double begin; + double end = -1.0; + double skip = 0.0; static const char* kwlist[] = {"sound", "begin", "end", "skip", nullptr}; - if(!PyArg_ParseTupleAndKeywords(args, kwds, "Of|ff:add", const_cast<char**>(kwlist), &object, &begin, &end, &skip)) + if(!PyArg_ParseTupleAndKeywords(args, kwds, "Od|dd:add", const_cast<char**>(kwlist), &object, &begin, &end, &skip)) return nullptr; Sound* sound = checkSound(object); diff --git a/extern/audaspace/bindings/python/PySequenceEntry.cpp b/extern/audaspace/bindings/python/PySequenceEntry.cpp index a1bf3db21d2..74c038de0b0 100644 --- a/extern/audaspace/bindings/python/PySequenceEntry.cpp +++ b/extern/audaspace/bindings/python/PySequenceEntry.cpp @@ -46,18 +46,18 @@ PyDoc_STRVAR(M_aud_SequenceEntry_move_doc, ".. classmethod:: move()\n\n" " Moves the entry.\n\n" " :arg begin: The new start time.\n" - " :type begin: float\n" + " :type begin: double\n" " :arg end: The new end time or a negative value if unknown.\n" - " :type end: float\n" + " :type end: double\n" " :arg skip: How many seconds to skip at the beginning.\n" - " :type skip: float\n"); + " :type skip: double\n"); static PyObject * SequenceEntry_move(SequenceEntry* self, PyObject* args) { - float begin, end, skip; + double begin, end, skip; - if(!PyArg_ParseTuple(args, "fff:move", &begin, &end, &skip)) + if(!PyArg_ParseTuple(args, "ddd:move", &begin, &end, &skip)) return nullptr; try diff --git a/extern/audaspace/bindings/python/PySound.cpp b/extern/audaspace/bindings/python/PySound.cpp index c37e3f7fa52..62ee3435e82 100644 --- a/extern/audaspace/bindings/python/PySound.cpp +++ b/extern/audaspace/bindings/python/PySound.cpp @@ -1394,7 +1394,7 @@ PyDoc_STRVAR(M_aud_Sound_threshold_doc, " with a amplitude >= threshold to 1, all <= -threshold to -1 and\n" " all between to 0.\n\n" " :arg threshold: Threshold value over which an amplitude counts\n" - " non-zero.\n" + " non-zero.\n\n" ":type threshold: float\n" ":return: The created :class:`Sound` object.\n" ":rtype: :class:`Sound`"); @@ -1434,7 +1434,8 @@ PyDoc_STRVAR(M_aud_Sound_volume_doc, " :type volume: float\n" " :return: The created :class:`Sound` object.\n" " :rtype: :class:`Sound`\n\n" - " .. note:: Should be in the range [0, 1] to avoid clipping.\n\n" + " .. note::\n\n" + " Should be in the range [0, 1] to avoid clipping.\n\n" " .. note::\n\n" " This is a filter function, you might consider using\n" " :attr:`Handle.volume` instead."); @@ -1475,8 +1476,8 @@ PyDoc_STRVAR(M_aud_Sound_join_doc, " :return: The created :class:`Sound` object.\n" " :rtype: :class:`Sound`\n\n" " .. note::\n\n" - " The two factories have to have the same specifications\n" - " (channels and samplerate)."); + " The two factories have to have the same specifications\n" + " (channels and samplerate)."); static PyObject * Sound_join(Sound* self, PyObject* object) |