From: Andreas Monzner Date: Tue, 10 Jan 2006 11:41:24 +0000 (+0000) Subject: speedups X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=9f9c513165bbcae496b79656304e60bf74557af4 speedups --- diff --git a/lib/actions/action.cpp b/lib/actions/action.cpp index 232237c..5468484 100644 --- a/lib/actions/action.cpp +++ b/lib/actions/action.cpp @@ -130,7 +130,7 @@ struct call_entry eWidget *m_widget; void *m_widget_arg; call_entry(PyObject *fnc, PyObject *arg): m_fnc(fnc), m_arg(arg), m_widget(0), m_widget_arg(0) { } - call_entry(eWidget *widget, void *arg): m_widget(widget), m_widget_arg(arg), m_fnc(0), m_arg(0) { } + call_entry(eWidget *widget, void *arg): m_fnc(0), m_arg(0), m_widget(widget), m_widget_arg(arg) { } }; void eActionMap::keyPressed(int device, int key, int flags) @@ -182,8 +182,8 @@ void eActionMap::keyPressed(int device, int key, int flags) (k->second.m_flags & (1<first.c_str())); - PyTuple_SetItem(pArgs, 1, PyString_FromString(k->second.m_action.c_str())); + PyTuple_SET_ITEM(pArgs, 0, PyString_FromString(k->first.c_str())); + PyTuple_SET_ITEM(pArgs, 1, PyString_FromString(k->second.m_action.c_str())); ++k; Py_INCREF(i->second.m_fnc); call_list.push_back(call_entry(i->second.m_fnc, pArgs)); @@ -193,8 +193,8 @@ void eActionMap::keyPressed(int device, int key, int flags) } else { PyObject *pArgs = PyTuple_New(2); - PyTuple_SetItem(pArgs, 0, PyInt_FromLong(key)); - PyTuple_SetItem(pArgs, 1, PyInt_FromLong(flags)); + PyTuple_SET_ITEM(pArgs, 0, PyInt_FromLong(key)); + PyTuple_SET_ITEM(pArgs, 1, PyInt_FromLong(flags)); Py_INCREF(i->second.m_fnc); call_list.push_back(call_entry(i->second.m_fnc, pArgs)); } diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp index 67acd83..d72b21b 100644 --- a/lib/gui/elistboxcontent.cpp +++ b/lib/gui/elistboxcontent.cpp @@ -335,12 +335,12 @@ void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style, if (m_list && cursorValid()) { - PyObject *item = PyList_GetItem(m_list, m_cursor); // borrowed reference! + PyObject *item = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference! painter.setFont(fnt); /* the user can supply tuples, in this case the first one will be displayed. */ if (PyTuple_Check(item)) - item = PyTuple_GetItem(item, 0); + item = PyTuple_GET_ITEM(item, 0); const char *string = PyString_Check(item) ? PyString_AsString(item) : ""; @@ -377,7 +377,7 @@ PyObject *eListboxPythonStringContent::getCurrentSelection() return 0; if (!cursorValid()) return 0; - PyObject *r = PyList_GetItem(m_list, m_cursor); + PyObject *r = PyList_GET_ITEM(m_list, m_cursor); Py_XINCREF(r); return r; } @@ -408,7 +408,7 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, if (m_list && cursorValid()) { /* get current list item */ - PyObject *item = PyList_GetItem(m_list, m_cursor); // borrowed reference! + PyObject *item = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference! PyObject *text = 0, *value = 0; painter.setFont(fnt); @@ -422,20 +422,20 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, { /* handle left part. get item from tuple, convert to string, display. */ - text = PyTuple_GetItem(item, 0); - text = PyObject_Str(text); /* creates a new object - old object was borrowed! */ + text = PyTuple_GET_ITEM(item, 0); +// text = PyObject_Str(text); /* creates a new object - old object was borrowed! */ const char *string = (text && PyString_Check(text)) ? PyString_AsString(text) : ""; eSize item_left = eSize(m_seperation, m_itemsize.height()); eSize item_right = eSize(m_itemsize.width() - m_seperation, m_itemsize.height()); painter.renderText(eRect(offset, item_left), string, gPainter::RT_HALIGN_LEFT); - Py_XDECREF(text); +// Py_XDECREF(text); /* now, handle the value. get 2nd part from tuple*/ - value = PyTuple_GetItem(item, 1); + value = PyTuple_GET_ITEM(item, 1); if (value) { PyObject *args = PyTuple_New(1); - PyTuple_SetItem(args, 0, PyInt_FromLong(selected)); + PyTuple_SET_ITEM(args, 0, PyInt_FromLong(selected)); /* CallObject will call __call__ which should return the value tuple */ value = PyObject_CallObject(value, args); @@ -451,14 +451,14 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, if (value && PyTuple_Check(value)) { /* convert type to string */ - PyObject *type = PyTuple_GetItem(value, 0); + PyObject *type = PyTuple_GET_ITEM(value, 0); const char *atype = (type && PyString_Check(type)) ? PyString_AsString(type) : 0; if (atype) { if (!strcmp(atype, "text")) { - PyObject *pvalue = PyTuple_GetItem(value, 1); + PyObject *pvalue = PyTuple_GET_ITEM(value, 1); const char *value = (pvalue && PyString_Check(pvalue)) ? PyString_AsString(pvalue) : ""; painter.setFont(fnt2); painter.renderText(eRect(offset + eSize(m_seperation, 0), item_right), value, gPainter::RT_HALIGN_RIGHT); @@ -466,7 +466,7 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, /* pvalue is borrowed */ } else if (!strcmp(atype, "slider")) { - PyObject *pvalue = PyTuple_GetItem(value, 1); + PyObject *pvalue = PyTuple_GET_ITEM(value, 1); /* convert value to Long. fallback to -1 on error. */ int value = (pvalue && PyInt_Check(pvalue)) ? PyInt_AsLong(pvalue) : -1; @@ -484,7 +484,7 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, /* pvalue is borrowed */ } else if (!strcmp(atype, "mtext")) { - PyObject *pvalue = PyTuple_GetItem(value, 1); + PyObject *pvalue = PyTuple_GET_ITEM(value, 1); const char *text = (pvalue && PyString_Check(pvalue)) ? PyString_AsString(pvalue) : ""; ePtr para = new eTextPara(eRect(offset + eSize(m_seperation, 0), item_right)); @@ -496,7 +496,7 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, PyObject *plist = 0; if (PyTuple_Size(value) >= 3) - plist = PyTuple_GetItem(value, 2); + plist = PyTuple_GET_ITEM(value, 2); int entries = 0; @@ -505,7 +505,7 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, for (int i = 0; i < entries; ++i) { - PyObject *entry = PyList_GetItem(plist, i); + PyObject *entry = PyList_GET_ITEM(plist, i); int num = PyInt_Check(entry) ? PyInt_AsLong(entry) : -1; if ((num < 0) || (num >= glyphs)) @@ -553,7 +553,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c if (m_list && cursorValid()) { - PyObject *items = PyList_GetItem(m_list, m_cursor); // borrowed reference! + PyObject *items = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference! if (!items) { diff --git a/lib/python/connections.h b/lib/python/connections.h index 9b4abdd..3df7b56 100644 --- a/lib/python/connections.h +++ b/lib/python/connections.h @@ -31,7 +31,7 @@ public: int i; for (i=0; i::operator()(a0); @@ -79,8 +79,8 @@ public: R operator()(V0 a0, V1 a1) { PyObject *pArgs = PyTuple_New(2); - PyTuple_SetItem(pArgs, 0, PyFrom(a0)); - PyTuple_SetItem(pArgs, 1, PyFrom(a1)); + PyTuple_SET_ITEM(pArgs, 0, PyFrom(a0)); + PyTuple_SET_ITEM(pArgs, 1, PyFrom(a1)); callPython(pArgs); Py_DECREF(pArgs); return Signal2::operator()(a0, a1);