refactored audio system

Author: Roberto De Ioris

Source/UnrealEnginePython/Private/UEPyAudio.cpp

@@ -1,35 +1,51 @@
 #include "UnrealEnginePythonPrivatePCH.h"
 #include "Sound/SoundWaveProcedural.h"
 
-PyObject *py_queue_procedural_audio(ue_PyUObject *self, PyObject * args) {
+PyObject *py_ue_queue_audio(ue_PyUObject *self, PyObject * args) {
 	// Writes from a Python buffer object to a USoundWaveProcedural class
 	ue_py_check(self);
 
-	if (!self->ue_object->IsA<USoundWaveProcedural>())
-		return PyErr_Format(PyExc_Exception, "UObject is not a USoundWaveProcedural.");
-
-	USoundWaveProcedural *sound_wave_procedural = (USoundWaveProcedural *)self->ue_object;
 	Py_buffer sound_buffer;
 
-	if(!PyArg_ParseTuple(args, "y*:write_audio_to_buffer", &sound_buffer)) {
+	if (!PyArg_ParseTuple(args, "y*:queue_audio", &sound_buffer)) {
 		return NULL;
 	}
 
+	USoundWaveProcedural *sound_wave_procedural = ue_py_check_type<USoundWaveProcedural>(self);
+	if (!sound_wave_procedural)
+		return PyErr_Format(PyExc_Exception, "UObject is not a USoundWaveProcedural.");
+
 	// Convert the buffer
 	uint8 *buffer = (uint8 *)sound_buffer.buf;
-	if(buffer == nullptr)
+	if (buffer == nullptr)
 		return PyErr_Format(PyExc_Exception, "Invalid sound buffer.");
 
 	// Add the audio to the Sound Wave's audio buffer
 	sound_wave_procedural->QueueAudio(buffer, sound_buffer.len);
-	
+
 	// Clean up
 	PyBuffer_Release(&sound_buffer);
 
 	Py_INCREF(Py_None);
 	return Py_None;
 }
 
+PyObject *py_ue_sound_get_data(ue_PyUObject *self, PyObject * args) {
+	ue_py_check(self);
+
+	USoundWave *sound = ue_py_check_type<USoundWave>(self);
+	if (!sound)
+		return PyErr_Format(PyExc_Exception, "UObject is not a USoundWave.");
+
+	FByteBulkData raw_data = sound->RawData;
+
+	char *data = (char *)raw_data.Lock(LOCK_READ_ONLY);
+	int32 data_size = raw_data.GetBulkDataSize();
+	PyObject *py_data = PyBytes_FromStringAndSize(data, data_size);
+	raw_data.Unlock();
+	return py_data;
+}
+
 PyObject *py_ue_play_sound_at_location(ue_PyUObject *self, PyObject * args) {
 
 	ue_py_check(self);
@@ -44,13 +60,9 @@ PyObject *py_ue_play_sound_at_location(ue_PyUObject *self, PyObject * args) {
 		return NULL;
 	}
 
-
 	USoundBase *sound_object = nullptr;
 	if (ue_is_pyuobject(sound)) {
-		ue_PyUObject *py_sound = (ue_PyUObject *)sound;
-		if (py_sound->ue_object->IsA<USoundBase>()) {
-			sound_object = (USoundBase *)py_sound->ue_object;
-		}
+		sound_object = ue_py_check_type<USoundBase>(sound);
 	}
 	else if (PyUnicodeOrString_Check(sound)) {
 		sound_object = FindObject<USoundBase>(ANY_PACKAGE, UTF8_TO_TCHAR(PyUnicode_AsUTF8(sound)));

Source/UnrealEnginePython/Private/UEPyAudio.h

@@ -4,5 +4,6 @@
 
 #include "UnrealEnginePython.h"
 
-PyObject *py_queue_procedural_audio(ue_PyUObject *self, PyObject * args);
-PyObject *py_ue_play_sound_at_location(ue_PyUObject *, PyObject *);
+PyObject *py_ue_queue_audio(ue_PyUObject *self, PyObject * args);
+PyObject *py_ue_play_sound_at_location(ue_PyUObject *, PyObject *);
+PyObject *py_ue_sound_get_data(ue_PyUObject *self, PyObject * args);

Source/UnrealEnginePython/Private/UEPyModule.cpp

@@ -528,7 +528,8 @@ static PyMethodDef ue_PyUObject_methods[] = {
 	{ "get_actor_velocity", (PyCFunction)py_ue_get_actor_velocity, METH_VARARGS, "" },
 
 	{ "play_sound_at_location", (PyCFunction)py_ue_play_sound_at_location, METH_VARARGS, "" },
-	{ "queue_audio", (PyCFunction)py_queue_procedural_audio, METH_VARARGS, "" },
+	{ "queue_audio", (PyCFunction)py_ue_queue_audio, METH_VARARGS, "" },
+	{ "sound_get_data", (PyCFunction)py_ue_sound_get_data, METH_VARARGS, "" },
 
 	{ "world_tick", (PyCFunction)py_ue_world_tick, METH_VARARGS, "" },