diff options
author | Campbell Barton <ideasman42@gmail.com> | 2007-06-29 12:59:26 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2007-06-29 12:59:26 +0400 |
commit | e192e7e02452c70511f688582d8d95d0a6267ee5 (patch) | |
tree | 75698ba122c3820668888ab38958e5c7e5cbb591 /source/blender/python/api2_2x/Sound.c | |
parent | 684869fd74a3a908a5df5802f440bfa823f6c802 (diff) |
remove unneeded checks from the python API
Diffstat (limited to 'source/blender/python/api2_2x/Sound.c')
-rw-r--r-- | source/blender/python/api2_2x/Sound.c | 51 |
1 files changed, 17 insertions, 34 deletions
diff --git a/source/blender/python/api2_2x/Sound.c b/source/blender/python/api2_2x/Sound.c index 66da43e6fad..6e20e4c3ee5 100644 --- a/source/blender/python/api2_2x/Sound.c +++ b/source/blender/python/api2_2x/Sound.c @@ -92,29 +92,24 @@ struct PyMethodDef M_Sound_methods[] = { static int Sound_compare( BPy_Sound * a, BPy_Sound * b ); static PyObject *Sound_repr( BPy_Sound * self ); -#define SOUND_FLOAT_METHODS(funcname, varname) \ -static PyObject *Sound_get ## funcname(BPy_Sound *self) { \ - char e[256]; \ - PyObject *attr = PyFloat_FromDouble(self->sound->varname); \ - if (attr) return attr; \ - sprintf(e, "couldn't get Sound.%s attribute", #varname); \ - return EXPP_ReturnPyObjError (PyExc_RuntimeError, e); \ -} \ +#define SOUND_FLOAT_METHODS(funcname, varname) \ +static PyObject *Sound_get ## funcname(BPy_Sound *self) { \ + return PyFloat_FromDouble(self->sound->varname); \ +} \ static PyObject *Sound_set ## funcname(BPy_Sound *self, PyObject *args) { \ - float f = 0; \ - if (!PyArg_ParseTuple(args, "f", &f)) \ - return (EXPP_ReturnPyObjError (PyExc_TypeError, \ - "expected float argument")); \ - self->sound->varname = EXPP_ClampFloat(f,\ - EXPP_SND_##varname##_MIN, EXPP_SND_##varname##_MAX);\ - Py_INCREF(Py_None); \ - return Py_None; \ + float f = 0; \ + if (!PyArg_ParseTuple(args, "f", &f)) \ + return (EXPP_ReturnPyObjError (PyExc_TypeError, \ + "expected float argument")); \ + self->sound->varname = EXPP_ClampFloat(f, \ + EXPP_SND_##varname##_MIN, EXPP_SND_##varname##_MAX); \ + Py_RETURN_NONE; \ } -#define SOUND_FLOAT_METHOD_FUNCS(varname) \ -{"get"#varname, (PyCFunction)Sound_get ## varname, METH_NOARGS, \ -"() - Return Sound object "#varname}, \ -{"set"#varname, (PyCFunction)Sound_set ## varname, METH_VARARGS, \ +#define SOUND_FLOAT_METHOD_FUNCS(varname) \ +{"get"#varname, (PyCFunction)Sound_get ## varname, METH_NOARGS, \ +"() - Return Sound object "#varname}, \ +{"set"#varname, (PyCFunction)Sound_set ## varname, METH_VARARGS, \ "(float) - Change Sound object "#varname}, @@ -354,24 +349,12 @@ bSound *Sound_FromPyObject( PyObject * pyobj ) /*****************************************************************************/ static PyObject *Sound_getName( BPy_Sound * self ) { - PyObject *attr = PyString_FromString( self->sound->id.name + 2 ); - - if( attr ) - return attr; - - return ( EXPP_ReturnPyObjError( PyExc_RuntimeError, - "couldn't get Sound.name attribute" ) ); + return PyString_FromString( self->sound->id.name + 2 ); } static PyObject *Sound_getFilename( BPy_Sound * self ) { - PyObject *attr = PyString_FromString( self->sound->name ); - - if( attr ) - return attr; - - return ( EXPP_ReturnPyObjError( PyExc_RuntimeError, - "couldn't get Sound.filename attribute" ) ); + return PyString_FromString( self->sound->name ); } static PyObject *Sound_getPacked( BPy_Sound * self ) |