[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30439] branches/soc-2010-nexyon/intern/ audaspace/Python/AUD_PyAPI.cpp: Audaspace Py API: Getting rid of string literal warnings.
Joerg Mueller
nexyon at gmail.com
Sat Jul 17 16:57:46 CEST 2010
Revision: 30439
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30439
Author: nexyon
Date: 2010-07-17 16:57:46 +0200 (Sat, 17 Jul 2010)
Log Message:
-----------
Audaspace Py API: Getting rid of string literal warnings.
Modified Paths:
--------------
branches/soc-2010-nexyon/intern/audaspace/Python/AUD_PyAPI.cpp
Modified: branches/soc-2010-nexyon/intern/audaspace/Python/AUD_PyAPI.cpp
===================================================================
--- branches/soc-2010-nexyon/intern/audaspace/Python/AUD_PyAPI.cpp 2010-07-17 14:34:52 UTC (rev 30438)
+++ branches/soc-2010-nexyon/intern/audaspace/Python/AUD_PyAPI.cpp 2010-07-17 14:57:46 UTC (rev 30439)
@@ -60,8 +60,30 @@
#include <cstdlib>
#include <unistd.h>
+// ====================================================================
+
#define PY_MODULE_ADD_CONSTANT(module, name) PyModule_AddIntConstant(module, #name, name)
+static inline int APyArg_ParseTupleAndKeywords(PyObject * o1, PyObject * o2, const char * f, const char ** k, ...)
+{
+ va_list ap;
+ va_start(ap, k);
+ int result = PyArg_ParseTupleAndKeywords(o1, o2, f, const_cast<char **>(k), ap);
+ va_end(ap);
+ return result;
+}
+
+static inline PyObject* APyObject_CallMethod(PyObject *o, const char *m, const char *f, ...)
+{
+ va_list ap;
+ va_start(ap, f);
+ PyObject* result = PyObject_CallMethod(o, const_cast<char *>(m), const_cast<char *>(f), ap);
+ va_end(ap);
+ return result;
+}
+
+// ====================================================================
+
static PyObject* AUDError;
// ====================================================================
@@ -83,10 +105,10 @@
self = (Sound*)type->tp_alloc(type, 0);
if(self != NULL)
{
- static char *kwlist[] = {"filename", NULL};
+ static const char *kwlist[] = {"filename", NULL};
const char* filename = NULL;
- if(!PyArg_ParseTupleAndKeywords(args, kwds, "|s", kwlist, &filename))
+ if(!APyArg_ParseTupleAndKeywords(args, kwds, "|s", kwlist, &filename))
{
Py_DECREF(self);
return NULL;
@@ -958,7 +980,7 @@
static PyObject *
Handle_pause(Handle *self)
{
- return PyObject_CallMethod(self->device, "_pause", "(O)", self);
+ return APyObject_CallMethod(self->device, "_pause", "(O)", self);
}
PyDoc_STRVAR(M_aud_Handle_resume_doc,
@@ -967,7 +989,7 @@
static PyObject *
Handle_resume(Handle *self)
{
- return PyObject_CallMethod(self->device, "_resume", "(O)", self);
+ return APyObject_CallMethod(self->device, "_resume", "(O)", self);
}
PyDoc_STRVAR(M_aud_Handle_stop_doc,
@@ -976,7 +998,7 @@
static PyObject *
Handle_stop(Handle *self)
{
- return PyObject_CallMethod(self->device, "_stop", "(O)", self);
+ return APyObject_CallMethod(self->device, "_stop", "(O)", self);
}
PyDoc_STRVAR(M_aud_Handle_update_doc,
@@ -985,7 +1007,7 @@
static PyObject *
Handle_update(Handle *self, PyObject *data)
{
- return PyObject_CallMethod(self->device, "_update_source", "(OO)", self, data);
+ return APyObject_CallMethod(self->device, "_update_source", "(OO)", self, data);
}
static PyMethodDef Handle_methods[] = {
@@ -1010,13 +1032,13 @@
static PyObject *
Handle_get_position(Handle *self, void* nothing)
{
- return PyObject_CallMethod(self->device, "_get_position", "(O)", self);
+ return APyObject_CallMethod(self->device, "_get_position", "(O)", self);
}
static int
Handle_set_position(Handle *self, PyObject* args, void* nothing)
{
- PyObject* result = PyObject_CallMethod(self->device, "_seek", "(OO)", self, args);
+ PyObject* result = APyObject_CallMethod(self->device, "_seek", "(OO)", self, args);
if(result)
{
Py_DECREF(result);
@@ -1031,7 +1053,7 @@
static int
Handle_set_keep(Handle *self, PyObject* args, void* nothing)
{
- PyObject* result = PyObject_CallMethod(self->device, "_set_keep", "(OO)", self, args);
+ PyObject* result = APyObject_CallMethod(self->device, "_set_keep", "(OO)", self, args);
if(result)
{
Py_DECREF(result);
@@ -1046,7 +1068,7 @@
static PyObject *
Handle_get_status(Handle *self, void* nothing)
{
- return PyObject_CallMethod(self->device, "_get_status", "(O)", self);
+ return APyObject_CallMethod(self->device, "_get_status", "(O)", self);
}
PyDoc_STRVAR(M_aud_Handle_volume_doc,
@@ -1055,13 +1077,13 @@
static PyObject *
Handle_get_volume(Handle *self, void* nothing)
{
- return PyObject_CallMethod(self->device, "_get_volume", "(O)", self);
+ return APyObject_CallMethod(self->device, "_get_volume", "(O)", self);
}
static int
Handle_set_volume(Handle *self, PyObject* args, void* nothing)
{
- PyObject* result = PyObject_CallMethod(self->device, "_set_volume", "(OO)", self, args);
+ PyObject* result = APyObject_CallMethod(self->device, "_set_volume", "(OO)", self, args);
if(result)
{
Py_DECREF(result);
@@ -1076,7 +1098,7 @@
static int
Handle_set_pitch(Handle *self, PyObject* args, void* nothing)
{
- PyObject* result = PyObject_CallMethod(self->device, "_set_pitch", "(OO)", self, args);
+ PyObject* result = APyObject_CallMethod(self->device, "_set_pitch", "(OO)", self, args);
if(result)
{
Py_DECREF(result);
@@ -1091,7 +1113,7 @@
static int
Handle_set_loop_count(Handle *self, PyObject* args, void* nothing)
{
- PyObject* result = PyObject_CallMethod(self->device, "_set_loop_count", "(OO)", self, args);
+ PyObject* result = APyObject_CallMethod(self->device, "_set_loop_count", "(OO)", self, args);
if(result)
{
Py_DECREF(result);
@@ -1106,13 +1128,13 @@
static PyObject *
Handle_get_relative(Handle *self, void* nothing)
{
- return PyObject_CallMethod(self->device, "_is_relative", "(O)", self);
+ return APyObject_CallMethod(self->device, "_is_relative", "(O)", self);
}
static int
Handle_set_relative(Handle *self, PyObject* args, void* nothing)
{
- PyObject* result = PyObject_CallMethod(self->device, "_set_relative", "(OO)", self, args);
+ PyObject* result = APyObject_CallMethod(self->device, "_set_relative", "(OO)", self, args);
if(result)
{
Py_DECREF(result);
@@ -1127,13 +1149,13 @@
static PyObject *
Handle_get_min_gain(Handle *self, void* nothing)
{
- return PyObject_CallMethod(self->device, "_get_min_gain", "(O)", self);
+ return APyObject_CallMethod(self->device, "_get_min_gain", "(O)", self);
}
static int
Handle_set_min_gain(Handle *self, PyObject* args, void* nothing)
{
- PyObject* result = PyObject_CallMethod(self->device, "_set_min_gain", "(OO)", self, args);
+ PyObject* result = APyObject_CallMethod(self->device, "_set_min_gain", "(OO)", self, args);
if(result)
{
Py_DECREF(result);
@@ -1148,13 +1170,13 @@
static PyObject *
Handle_get_max_gain(Handle *self, void* nothing)
{
- return PyObject_CallMethod(self->device, "_get_max_gain", "(O)", self);
+ return APyObject_CallMethod(self->device, "_get_max_gain", "(O)", self);
}
static int
Handle_set_max_gain(Handle *self, PyObject* args, void* nothing)
{
- PyObject* result = PyObject_CallMethod(self->device, "_set_max_gain", "(OO)", self, args);
+ PyObject* result = APyObject_CallMethod(self->device, "_set_max_gain", "(OO)", self, args);
if(result)
{
Py_DECREF(result);
@@ -1169,13 +1191,13 @@
static PyObject *
Handle_get_reference_distance(Handle *self, void* nothing)
{
- return PyObject_CallMethod(self->device, "_get_reference_distance", "(O)", self);
+ return APyObject_CallMethod(self->device, "_get_reference_distance", "(O)", self);
}
static int
Handle_set_reference_distance(Handle *self, PyObject* args, void* nothing)
{
- PyObject* result = PyObject_CallMethod(self->device, "_set_reference_distance", "(OO)", self, args);
+ PyObject* result = APyObject_CallMethod(self->device, "_set_reference_distance", "(OO)", self, args);
if(result)
{
Py_DECREF(result);
@@ -1190,13 +1212,13 @@
static PyObject *
Handle_get_max_distance(Handle *self, void* nothing)
{
- return PyObject_CallMethod(self->device, "_get_max_distance", "(O)", self);
+ return APyObject_CallMethod(self->device, "_get_max_distance", "(O)", self);
}
static int
Handle_set_max_distance(Handle *self, PyObject* args, void* nothing)
{
- PyObject* result = PyObject_CallMethod(self->device, "_set_max_distance", "(OO)", self, args);
+ PyObject* result = APyObject_CallMethod(self->device, "_set_max_distance", "(OO)", self, args);
if(result)
{
Py_DECREF(result);
@@ -1211,13 +1233,13 @@
static PyObject *
Handle_get_rolloff_factor(Handle *self, void* nothing)
{
- return PyObject_CallMethod(self->device, "_get_rolloff_factor", "(O)", self);
+ return APyObject_CallMethod(self->device, "_get_rolloff_factor", "(O)", self);
}
static int
Handle_set_rolloff_factor(Handle *self, PyObject* args, void* nothing)
{
- PyObject* result = PyObject_CallMethod(self->device, "_set_rolloff_factor", "(OO)", self, args);
+ PyObject* result = APyObject_CallMethod(self->device, "_set_rolloff_factor", "(OO)", self, args);
if(result)
{
Py_DECREF(result);
@@ -1232,13 +1254,13 @@
static PyObject *
Handle_get_cone_inner_angle(Handle *self, void* nothing)
{
- return PyObject_CallMethod(self->device, "_get_cone_inner_angle", "(O)", self);
+ return APyObject_CallMethod(self->device, "_get_cone_inner_angle", "(O)", self);
}
static int
Handle_set_cone_inner_angle(Handle *self, PyObject* args, void* nothing)
{
- PyObject* result = PyObject_CallMethod(self->device, "_set_cone_inner_angle", "(OO)", self, args);
+ PyObject* result = APyObject_CallMethod(self->device, "_set_cone_inner_angle", "(OO)", self, args);
if(result)
{
Py_DECREF(result);
@@ -1253,13 +1275,13 @@
static PyObject *
Handle_get_cone_outer_angle(Handle *self, void* nothing)
{
- return PyObject_CallMethod(self->device, "_get_cone_outer_angle", "(O)", self);
+ return APyObject_CallMethod(self->device, "_get_cone_outer_angle", "(O)", self);
}
static int
Handle_set_cone_outer_angle(Handle *self, PyObject* args, void* nothing)
{
- PyObject* result = PyObject_CallMethod(self->device, "_set_cone_outer_angle", "(OO)", self, args);
+ PyObject* result = APyObject_CallMethod(self->device, "_set_cone_outer_angle", "(OO)", self, args);
if(result)
{
Py_DECREF(result);
@@ -1274,13 +1296,13 @@
static PyObject *
Handle_get_cone_outer_gain(Handle *self, void* nothing)
{
- return PyObject_CallMethod(self->device, "_get_cone_outer_gain", "(O)", self);
+ return APyObject_CallMethod(self->device, "_get_cone_outer_gain", "(O)", self);
}
static int
Handle_set_cone_outer_gain(Handle *self, PyObject* args, void* nothing)
{
- PyObject* result = PyObject_CallMethod(self->device, "_set_cone_outer_gain", "(OO)", self, args);
+ PyObject* result = APyObject_CallMethod(self->device, "_set_cone_outer_gain", "(OO)", self, args);
if(result)
{
Py_DECREF(result);
@@ -1290,35 +1312,35 @@
}
static PyGetSetDef Handle_properties[] = {
- {"position", (getter)Handle_get_position, (setter)Handle_set_position,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list