mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-02 12:32:29 +00:00
codegen/: Updates from pygtk's codegen and typo fix
Original commit message from CVS: * codegen/codegen.py: * codegen/argtypes.py: Updates from pygtk's codegen and typo fix
This commit is contained in:
parent
139163d89e
commit
38acc2aff7
4 changed files with 9 additions and 18 deletions
|
@ -1,3 +1,9 @@
|
|||
2005-08-08 Edward Hervey <edward@fluendo.com>
|
||||
|
||||
* codegen/codegen.py:
|
||||
* codegen/argtypes.py:
|
||||
Updates from pygtk's codegen and typo fix
|
||||
|
||||
2005-08-04 Edward Hervey <edward@fluendo.com>
|
||||
|
||||
* gst/gst.defs:
|
||||
|
|
|
@ -141,18 +141,6 @@ class CharArg(ArgType):
|
|||
info.varlist.add('gchar', 'ret')
|
||||
info.codeafter.append(' return PyString_FromStringAndSize(&ret, 1);')
|
||||
class GUniCharArg(ArgType):
|
||||
param_tmpl = (' if (py_%(name)s[1] != 0) {\n'
|
||||
' PyErr_SetString(PyExc_TypeError, "%(name)s should be a 1 character unicode string");\n'
|
||||
' return NULL;\n'
|
||||
' }\n'
|
||||
' %(name)s = (gunichar)py_%(name)s[0];\n')
|
||||
dflt_tmpl = (' if (py_%(name)s != NULL) {\n'
|
||||
' if (py_%(name)s[1] != 0) {\n'
|
||||
' PyErr_SetString(PyExc_TypeError, "%(name)s should be a 1 character unicode string");\n'
|
||||
' return NULL;\n'
|
||||
' }\n'
|
||||
' %(name)s = (gunichar)py_%(name)s[0];\n'
|
||||
' }\n')
|
||||
ret_tmpl = ('#if !defined(Py_UNICODE_SIZE) || Py_UNICODE_SIZE == 2\n'
|
||||
' if (ret > 0xffff) {\n'
|
||||
' PyErr_SetString(PyExc_RuntimeError, "returned character can not be represented in 16-bit unicode");\n'
|
||||
|
@ -164,13 +152,10 @@ class GUniCharArg(ArgType):
|
|||
def write_param(self, ptype, pname, pdflt, pnull, info):
|
||||
if pdflt:
|
||||
info.varlist.add('gunichar', pname + " = '" + pdflt + "'")
|
||||
info.codebefore.append(self.dflt_tmpl % {'name':pname})
|
||||
else:
|
||||
info.varlist.add('gunichar', pname)
|
||||
info.codebefore.append(self.param_tmpl % {'name':pname})
|
||||
info.varlist.add('Py_UNICODE', '*py_' + pname + ' = NULL')
|
||||
info.arglist.append(pname)
|
||||
info.add_parselist('u', ['&py_' + pname], [pname])
|
||||
info.add_parselist('O&', ['pyg_pyobj_to_unichar_conv', '&' + pname], [pname])
|
||||
def write_return(self, ptype, ownsreturn, info):
|
||||
info.varlist.add('gunichar', 'ret')
|
||||
info.varlist.add('Py_UNICODE', 'py_ret')
|
||||
|
|
|
@ -865,7 +865,7 @@ class GstMiniObjectWrapper(Wrapper):
|
|||
def get_initial_constructor_substdict(self, constructor):
|
||||
substdict = Wrapper.get_initial_constructor_substdict(self, constructor)
|
||||
if not constructor.caller_owns_return:
|
||||
substdict['aftercreate'] = " g_object_ref(self->obj);\n"
|
||||
substdict['aftercreate'] = " gst_mini_object_ref(self->obj);\n"
|
||||
else:
|
||||
substdict['aftercreate'] = ''
|
||||
return substdict
|
||||
|
|
2
common
2
common
|
@ -1 +1 @@
|
|||
Subproject commit 694de4dbf4827f372321f0634643a254d7edd986
|
||||
Subproject commit 856fbbfa88621ab67df141ead8d4d3df32c5c176
|
Loading…
Reference in a new issue