diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/python/intern/bpy_app_timers.c | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/python/intern/bpy_app_timers.c')
-rw-r--r-- | source/blender/python/intern/bpy_app_timers.c | 238 |
1 files changed, 116 insertions, 122 deletions
diff --git a/source/blender/python/intern/bpy_app_timers.c b/source/blender/python/intern/bpy_app_timers.c index 38a785d0d82..c3c56e4fb66 100644 --- a/source/blender/python/intern/bpy_app_timers.c +++ b/source/blender/python/intern/bpy_app_timers.c @@ -29,167 +29,161 @@ #include "../generic/py_capi_utils.h" #include "../generic/python_utildefines.h" - static double handle_returned_value(PyObject *function, PyObject *ret) { - if (ret == NULL) { - PyErr_PrintEx(0); - PyErr_Clear(); - return -1; - } - - if (ret == Py_None) { - return -1; - } - - double value = PyFloat_AsDouble(ret); - if (value == -1.0f && PyErr_Occurred()) { - PyErr_Clear(); - printf("Error: 'bpy.app.timers' callback "); - PyObject_Print(function, stdout, Py_PRINT_RAW); - printf(" did not return None or float.\n"); - return -1; - } - - if (value < 0.0) { - value = 0.0; - } - - return value; + if (ret == NULL) { + PyErr_PrintEx(0); + PyErr_Clear(); + return -1; + } + + if (ret == Py_None) { + return -1; + } + + double value = PyFloat_AsDouble(ret); + if (value == -1.0f && PyErr_Occurred()) { + PyErr_Clear(); + printf("Error: 'bpy.app.timers' callback "); + PyObject_Print(function, stdout, Py_PRINT_RAW); + printf(" did not return None or float.\n"); + return -1; + } + + if (value < 0.0) { + value = 0.0; + } + + return value; } static double py_timer_execute(uintptr_t UNUSED(uuid), void *user_data) { - PyObject *function = user_data; + PyObject *function = user_data; - PyGILState_STATE gilstate; - gilstate = PyGILState_Ensure(); + PyGILState_STATE gilstate; + gilstate = PyGILState_Ensure(); - PyObject *py_ret = PyObject_CallObject(function, NULL); - double ret = handle_returned_value(function, py_ret); + PyObject *py_ret = PyObject_CallObject(function, NULL); + double ret = handle_returned_value(function, py_ret); - PyGILState_Release(gilstate); + PyGILState_Release(gilstate); - return ret; + return ret; } static void py_timer_free(uintptr_t UNUSED(uuid), void *user_data) { - PyObject *function = user_data; + PyObject *function = user_data; - PyGILState_STATE gilstate; - gilstate = PyGILState_Ensure(); + PyGILState_STATE gilstate; + gilstate = PyGILState_Ensure(); - Py_DECREF(function); + Py_DECREF(function); - PyGILState_Release(gilstate); + PyGILState_Release(gilstate); } - -PyDoc_STRVAR(bpy_app_timers_register_doc, -".. function:: register(function, first_interval=0, persistent=False)\n" -"\n" -" Add a new function that will be called after the specified amount of seconds.\n" -" The function gets no arguments and is expected to return either None or a float.\n" -" If ``None`` is returned, the timer will be unregistered.\n" -" A returned number specifies the delay until the function is called again.\n" -" ``functools.partial`` can be used to assign some parameters.\n" -"\n" -" :arg function: The function that should called.\n" -" :type function: Callable[[], Union[float, None]]\n" -" :arg first_interval: Seconds until the callback should be called the first time.\n" -" :type first_interval: float\n" -" :arg persistent: Don't remove timer when a new file is loaded.\n" -" :type persistent: bool\n" -); +PyDoc_STRVAR( + bpy_app_timers_register_doc, + ".. function:: register(function, first_interval=0, persistent=False)\n" + "\n" + " Add a new function that will be called after the specified amount of seconds.\n" + " The function gets no arguments and is expected to return either None or a float.\n" + " If ``None`` is returned, the timer will be unregistered.\n" + " A returned number specifies the delay until the function is called again.\n" + " ``functools.partial`` can be used to assign some parameters.\n" + "\n" + " :arg function: The function that should called.\n" + " :type function: Callable[[], Union[float, None]]\n" + " :arg first_interval: Seconds until the callback should be called the first time.\n" + " :type first_interval: float\n" + " :arg persistent: Don't remove timer when a new file is loaded.\n" + " :type persistent: bool\n"); static PyObject *bpy_app_timers_register(PyObject *UNUSED(self), PyObject *args, PyObject *kw) { - PyObject *function; - double first_interval = 0; - int persistent = false; - - static const char *_keywords[] = {"function", "first_interval", "persistent", NULL}; - static _PyArg_Parser _parser = {"O|$dp:register", _keywords, 0}; - if (!_PyArg_ParseTupleAndKeywordsFast( - args, kw, &_parser, - &function, &first_interval, &persistent)) - { - return NULL; - } - - if (!PyCallable_Check(function)) { - PyErr_SetString(PyExc_TypeError, "function is not callable"); - return NULL; - } - - Py_INCREF(function); - BLI_timer_register( - (intptr_t)function, - py_timer_execute, function, py_timer_free, - first_interval, persistent); - Py_RETURN_NONE; + PyObject *function; + double first_interval = 0; + int persistent = false; + + static const char *_keywords[] = {"function", "first_interval", "persistent", NULL}; + static _PyArg_Parser _parser = {"O|$dp:register", _keywords, 0}; + if (!_PyArg_ParseTupleAndKeywordsFast( + args, kw, &_parser, &function, &first_interval, &persistent)) { + return NULL; + } + + if (!PyCallable_Check(function)) { + PyErr_SetString(PyExc_TypeError, "function is not callable"); + return NULL; + } + + Py_INCREF(function); + BLI_timer_register( + (intptr_t)function, py_timer_execute, function, py_timer_free, first_interval, persistent); + Py_RETURN_NONE; } PyDoc_STRVAR(bpy_app_timers_unregister_doc, -".. function:: unregister(function)\n" -"\n" -" Unregister timer.\n" -"\n" -" :arg function: Function to unregister.\n" -" :type function: function\n" -); + ".. function:: unregister(function)\n" + "\n" + " Unregister timer.\n" + "\n" + " :arg function: Function to unregister.\n" + " :type function: function\n"); static PyObject *bpy_app_timers_unregister(PyObject *UNUSED(self), PyObject *function) { - if (!BLI_timer_unregister((intptr_t)function)) { - PyErr_SetString(PyExc_ValueError, "Error: function is not registered"); - return NULL; - } - Py_RETURN_NONE; + if (!BLI_timer_unregister((intptr_t)function)) { + PyErr_SetString(PyExc_ValueError, "Error: function is not registered"); + return NULL; + } + Py_RETURN_NONE; } PyDoc_STRVAR(bpy_app_timers_is_registered_doc, -".. function:: is_registered(function)\n" -"\n" -" Check if this function is registered as a timer.\n" -"\n" -" :arg function: Function to check.\n" -" :type function: int\n" -" :return: True when this function is registered, otherwise False.\n" -" :rtype: bool\n" -); + ".. function:: is_registered(function)\n" + "\n" + " Check if this function is registered as a timer.\n" + "\n" + " :arg function: Function to check.\n" + " :type function: int\n" + " :return: True when this function is registered, otherwise False.\n" + " :rtype: bool\n"); static PyObject *bpy_app_timers_is_registered(PyObject *UNUSED(self), PyObject *function) { - bool ret = BLI_timer_is_registered((intptr_t)function); - return PyBool_FromLong(ret); + bool ret = BLI_timer_is_registered((intptr_t)function); + return PyBool_FromLong(ret); } - static struct PyMethodDef M_AppTimers_methods[] = { - {"register", (PyCFunction)bpy_app_timers_register, - METH_VARARGS | METH_KEYWORDS, bpy_app_timers_register_doc}, - {"unregister", (PyCFunction)bpy_app_timers_unregister, - METH_O, bpy_app_timers_unregister_doc}, - {"is_registered", (PyCFunction)bpy_app_timers_is_registered, - METH_O, bpy_app_timers_is_registered_doc}, - {NULL, NULL, 0, NULL}, + {"register", + (PyCFunction)bpy_app_timers_register, + METH_VARARGS | METH_KEYWORDS, + bpy_app_timers_register_doc}, + {"unregister", (PyCFunction)bpy_app_timers_unregister, METH_O, bpy_app_timers_unregister_doc}, + {"is_registered", + (PyCFunction)bpy_app_timers_is_registered, + METH_O, + bpy_app_timers_is_registered_doc}, + {NULL, NULL, 0, NULL}, }; static struct PyModuleDef M_AppTimers_module_def = { - PyModuleDef_HEAD_INIT, - "bpy.app.timers", /* m_name */ - NULL, /* m_doc */ - 0, /* m_size */ - M_AppTimers_methods, /* m_methods */ - NULL, /* m_reload */ - NULL, /* m_traverse */ - NULL, /* m_clear */ - NULL, /* m_free */ + PyModuleDef_HEAD_INIT, + "bpy.app.timers", /* m_name */ + NULL, /* m_doc */ + 0, /* m_size */ + M_AppTimers_methods, /* m_methods */ + NULL, /* m_reload */ + NULL, /* m_traverse */ + NULL, /* m_clear */ + NULL, /* m_free */ }; PyObject *BPY_app_timers_module(void) { - PyObject *sys_modules = PyImport_GetModuleDict(); - PyObject *mod = PyModule_Create(&M_AppTimers_module_def); - PyDict_SetItem(sys_modules, PyModule_GetNameObject(mod), mod); - return mod; + PyObject *sys_modules = PyImport_GetModuleDict(); + PyObject *mod = PyModule_Create(&M_AppTimers_module_def); + PyDict_SetItem(sys_modules, PyModule_GetNameObject(mod), mod); + return mod; } |