gst/: Fix broken indentation

Original commit message from CVS:
* gst/__init__.py:
* gst/arg-types.py:
Fix broken indentation
Fixes #531697
This commit is contained in:
Edward Hervey 2008-05-08 14:03:17 +00:00
parent d61ee05178
commit 5119268c19
3 changed files with 213 additions and 206 deletions

View file

@ -1,3 +1,10 @@
2008-05-08 Edward Hervey <edward.hervey@collabora.co.uk>
* gst/__init__.py:
* gst/arg-types.py:
Fix broken indentation
Fixes #531697
2008-05-08 Edward Hervey <edward.hervey@collabora.co.uk> 2008-05-08 Edward Hervey <edward.hervey@collabora.co.uk>
* gst/gst.override: * gst/gst.override:

View file

@ -26,7 +26,7 @@ try:
import gstltihooks import gstltihooks
__gstltihooks_used__ = True __gstltihooks_used__ = True
except: except:
pass pass
import sys import sys
@ -37,43 +37,43 @@ if 'gobject' not in sys.modules:
pygtk.require('2.0') pygtk.require('2.0')
class Value: class Value:
def __init__(self, type): def __init__(self, type):
assert type in ('fourcc', 'intrange', 'doublerange', 'fractionrange', 'fraction') assert type in ('fourcc', 'intrange', 'doublerange', 'fractionrange', 'fraction')
self.type = type self.type = type
class Fourcc(Value): class Fourcc(Value):
def __init__(self, string): def __init__(self, string):
Value.__init__(self, 'fourcc') Value.__init__(self, 'fourcc')
self.fourcc = string self.fourcc = string
def __repr__(self): def __repr__(self):
return '<gst.Fourcc %s>' % self.fourcc return '<gst.Fourcc %s>' % self.fourcc
class IntRange(Value): class IntRange(Value):
def __init__(self, low, high): def __init__(self, low, high):
Value.__init__(self, 'intrange') Value.__init__(self, 'intrange')
self.low = low self.low = low
self.high = high self.high = high
def __repr__(self): def __repr__(self):
return '<gst.IntRange [%d, %d]>' % (self.low, self.high) return '<gst.IntRange [%d, %d]>' % (self.low, self.high)
class DoubleRange(Value): class DoubleRange(Value):
def __init__(self, low, high): def __init__(self, low, high):
Value.__init__(self, 'doublerange') Value.__init__(self, 'doublerange')
self.low = low self.low = low
self.high = high self.high = high
def __repr__(self): def __repr__(self):
return '<gst.DoubleRange [%f, %f]>' % (self.low, self.high) return '<gst.DoubleRange [%f, %f]>' % (self.low, self.high)
class FractionRange(Value): class FractionRange(Value):
def __init__(self, low, high): def __init__(self, low, high):
Value.__init__(self, 'fractionrange') Value.__init__(self, 'fractionrange')
self.low = low self.low = low
self.high = high self.high = high
def __repr__(self): def __repr__(self):
return '<gst.FractionRange [%d/%d, %d/%d]>' % (self.low.num, return '<gst.FractionRange [%d/%d, %d/%d]>' % (self.low.num,
self.low.denom, self.low.denom,
self.high.num, self.high.num,
self.high.denom) self.high.denom)
class Fraction(Value): class Fraction(Value):
def __init__(self, num, denom=1): def __init__(self, num, denom=1):

View file

@ -19,7 +19,7 @@
# License along with this library; if not, write to the # License along with this library; if not, write to the
# Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA. # Boston, MA 02111-1307, USA.
# #
# Author: David I. Lehn <dlehn@users.sourceforge.net> # Author: David I. Lehn <dlehn@users.sourceforge.net>
from argtypes import UInt64Arg, Int64Arg, PointerArg, ArgMatcher, ArgType, matcher from argtypes import UInt64Arg, Int64Arg, PointerArg, ArgMatcher, ArgType, matcher
@ -27,11 +27,11 @@ from reversewrapper import Parameter, ReturnType, GBoxedParam, GBoxedReturn, Int
class XmlNodeArg(ArgType): class XmlNodeArg(ArgType):
"""libxml2 node generator""" """libxml2 node generator"""
names = {"xobj":"xmlNode", names = {"xobj":"xmlNode",
"xptr":"xmlNodePtr", "xptr":"xmlNodePtr",
"xwrap":"libxml_xmlNodePtrWrap"} "xwrap":"libxml_xmlNodePtrWrap"}
parm = (' if(xml == NULL) return NULL;\n' parm = (' if(xml == NULL) return NULL;\n'
' xobj = PyObject_GetAttrString(xml, "%(xobj)s");\n' ' xobj = PyObject_GetAttrString(xml, "%(xobj)s");\n'
' if(!PyObject_IsInstance(py%(name)s, xobj)) {\n' ' if(!PyObject_IsInstance(py%(name)s, xobj)) {\n'
@ -43,14 +43,14 @@ class XmlNodeArg(ArgType):
' o = PyObject_GetAttrString(py%(name)s, "_o");\n' ' o = PyObject_GetAttrString(py%(name)s, "_o");\n'
' %(name)s = PyCObject_AsVoidPtr(o);\n') ' %(name)s = PyCObject_AsVoidPtr(o);\n')
parmp = (' Py_DECREF(o); Py_DECREF(xobj);Py_DECREF(xml);\n') parmp = (' Py_DECREF(o); Py_DECREF(xobj);Py_DECREF(xml);\n')
ret = (' if(xml == NULL) return NULL;\n') ret = (' if(xml == NULL) return NULL;\n')
retp = (' xargs = PyTuple_New(1);\n' retp = (' xargs = PyTuple_New(1);\n'
' xobj = PyObject_GetAttrString(xml, "%(xobj)s");\n' ' xobj = PyObject_GetAttrString(xml, "%(xobj)s");\n'
' o = %(xwrap)s(ret);\n' ' o = %(xwrap)s(ret);\n'
' PyTuple_SetItem(xargs, 0, o);\n' ' PyTuple_SetItem(xargs, 0, o);\n'
' return PyInstance_New(xobj, xargs, PyDict_New());\n') ' return PyInstance_New(xobj, xargs, PyDict_New());\n')
def write_param(self, ptype, pname, pdflt, pnull, keeprefcount, info): def write_param(self, ptype, pname, pdflt, pnull, keeprefcount, info):
info.varlist.add('PyObject', '*xml = _gst_get_libxml2_module()') info.varlist.add('PyObject', '*xml = _gst_get_libxml2_module()')
info.varlist.add('PyObject', '*o') info.varlist.add('PyObject', '*o')
@ -71,73 +71,73 @@ class XmlNodeArg(ArgType):
info.varlist.add(self.names["xptr"], 'ret') info.varlist.add(self.names["xptr"], 'ret')
info.codebefore.append(self.ret % self.names) info.codebefore.append(self.ret % self.names)
info.codeafter.append(self.retp % self.names) info.codeafter.append(self.retp % self.names)
class XmlDocArg(XmlNodeArg): class XmlDocArg(XmlNodeArg):
"""libxml2 doc generator""" """libxml2 doc generator"""
names = {"xobj":"xmlDoc", names = {"xobj":"xmlDoc",
"xptr":"xmlDocPtr", "xptr":"xmlDocPtr",
"xwrap":"libxml_xmlDocPtrWrap"} "xwrap":"libxml_xmlDocPtrWrap"}
class GstCapsArg(ArgType): class GstCapsArg(ArgType):
"""GstCaps node generator""" """GstCaps node generator"""
before = (' %(name)s = pygst_caps_from_pyobject (py_%(name)s, %(namecopy)s);\n' before = (' %(name)s = pygst_caps_from_pyobject (py_%(name)s, %(namecopy)s);\n'
' if (PyErr_Occurred())\n' ' if (PyErr_Occurred())\n'
' return NULL;\n') ' return NULL;\n')
beforenull = (' if (py_%(name)s == Py_None || py_%(name)s == NULL)\n' beforenull = (' if (py_%(name)s == Py_None || py_%(name)s == NULL)\n'
' %(name)s = NULL;\n' ' %(name)s = NULL;\n'
' else\n' ' else\n'
' ' + before) ' ' + before)
after = (' if (%(name)s && %(name)s_is_copy)\n' after = (' if (%(name)s && %(name)s_is_copy)\n'
' gst_caps_unref (%(name)s);\n') ' gst_caps_unref (%(name)s);\n')
def write_param(self, ptype, pname, pdflt, pnull, keeprefcount, info): def write_param(self, ptype, pname, pdflt, pnull, keeprefcount, info):
if ptype == 'const-GstCaps*': if ptype == 'const-GstCaps*':
self.write_const_param(pname, pdflt, pnull, info) self.write_const_param(pname, pdflt, pnull, info)
elif ptype == 'GstCaps*': elif ptype == 'GstCaps*':
self.write_normal_param(pname, pdflt, pnull, info) self.write_normal_param(pname, pdflt, pnull, info)
else: else:
raise RuntimeError, "write_param not implemented for %s" % ptype raise RuntimeError, "write_param not implemented for %s" % ptype
def write_const_param(self, pname, pdflt, pnull, info): def write_const_param(self, pname, pdflt, pnull, info):
if pdflt: if pdflt:
assert pdflt == 'NULL' assert pdflt == 'NULL'
info.varlist.add('PyObject', '*py_' + pname + ' = NULL') info.varlist.add('PyObject', '*py_' + pname + ' = NULL')
else: else:
info.varlist.add('PyObject', '*py_' + pname) info.varlist.add('PyObject', '*py_' + pname)
info.varlist.add('GstCaps', '*'+pname) info.varlist.add('GstCaps', '*'+pname)
info.varlist.add('gboolean', pname+'_is_copy') info.varlist.add('gboolean', pname+'_is_copy')
info.add_parselist('O', ['&py_'+pname], [pname]) info.add_parselist('O', ['&py_'+pname], [pname])
info.arglist.append(pname) info.arglist.append(pname)
if pnull: if pnull:
info.codebefore.append (self.beforenull % { 'name' : pname, 'namecopy' : '&'+pname+'_is_copy' }) info.codebefore.append (self.beforenull % { 'name' : pname, 'namecopy' : '&'+pname+'_is_copy' })
else: else:
info.codebefore.append (self.before % { 'name' : pname, 'namecopy' : '&'+pname+'_is_copy' }) info.codebefore.append (self.before % { 'name' : pname, 'namecopy' : '&'+pname+'_is_copy' })
info.codeafter.append (self.after % { 'name' : pname, 'namecopy' : '&'+pname+'_is_copy' }) info.codeafter.append (self.after % { 'name' : pname, 'namecopy' : '&'+pname+'_is_copy' })
def write_normal_param(self, pname, pdflt, pnull, info): def write_normal_param(self, pname, pdflt, pnull, info):
if pdflt: if pdflt:
assert pdflt == 'NULL' assert pdflt == 'NULL'
info.varlist.add('PyObject', '*py_' + pname + ' = NULL') info.varlist.add('PyObject', '*py_' + pname + ' = NULL')
else: else:
info.varlist.add('PyObject', '*py_' + pname) info.varlist.add('PyObject', '*py_' + pname)
info.varlist.add('GstCaps', '*'+pname) info.varlist.add('GstCaps', '*'+pname)
info.add_parselist('O', ['&py_'+pname], [pname]) info.add_parselist('O', ['&py_'+pname], [pname])
info.arglist.append(pname) info.arglist.append(pname)
if pnull: if pnull:
info.codebefore.append (self.beforenull % { 'name' : pname, 'namecopy' : 'NULL' }) info.codebefore.append (self.beforenull % { 'name' : pname, 'namecopy' : 'NULL' })
else: else:
info.codebefore.append (self.before % { 'name' : pname, 'namecopy' : 'NULL' }) info.codebefore.append (self.before % { 'name' : pname, 'namecopy' : 'NULL' })
def write_return(self, ptype, ownsreturn, info): def write_return(self, ptype, ownsreturn, info):
if ptype == 'GstCaps*': if ptype == 'GstCaps*':
info.varlist.add('GstCaps', '*ret') info.varlist.add('GstCaps', '*ret')
copyval = 'FALSE' copyval = 'FALSE'
elif ptype == 'const-GstCaps*': elif ptype == 'const-GstCaps*':
info.varlist.add('const GstCaps', '*ret') info.varlist.add('const GstCaps', '*ret')
copyval = 'TRUE' copyval = 'TRUE'
else: else:
raise RuntimeError, "write_return not implemented for %s" % ptype raise RuntimeError, "write_return not implemented for %s" % ptype
info.codeafter.append(' return pyg_boxed_new (GST_TYPE_CAPS, ret, '+copyval+', TRUE);') info.codeafter.append(' return pyg_boxed_new (GST_TYPE_CAPS, ret, '+copyval+', TRUE);')
class GstIteratorArg(ArgType): class GstIteratorArg(ArgType):
@ -147,39 +147,39 @@ class GstIteratorArg(ArgType):
class GstMiniObjectParam(Parameter): class GstMiniObjectParam(Parameter):
def get_c_type(self): def get_c_type(self):
return self.props.get('c_type', 'GstMiniObject *') return self.props.get('c_type', 'GstMiniObject *')
def convert_c2py(self): def convert_c2py(self):
self.wrapper.add_declaration("PyObject *py_%s = NULL;" % self.name) self.wrapper.add_declaration("PyObject *py_%s = NULL;" % self.name)
self.wrapper.write_code(code=("if (%s) {\n" self.wrapper.write_code(code=("if (%s) {\n"
" py_%s = pygstminiobject_new((GstMiniObject *) %s);\n" " py_%s = pygstminiobject_new((GstMiniObject *) %s);\n"
" gst_mini_object_unref ((GstMiniObject *) %s);\n" " gst_mini_object_unref ((GstMiniObject *) %s);\n"
"} else {\n" "} else {\n"
" Py_INCREF(Py_None);\n" " Py_INCREF(Py_None);\n"
" py_%s = Py_None;\n" " py_%s = Py_None;\n"
"}" "}"
% (self.name, self.name, self.name, self.name, self.name)), % (self.name, self.name, self.name, self.name, self.name)),
cleanup=("gst_mini_object_ref ((GstMiniObject *) %s);\nPy_DECREF(py_%s);" % (self.name, self.name))) cleanup=("gst_mini_object_ref ((GstMiniObject *) %s);\nPy_DECREF(py_%s);" % (self.name, self.name)))
self.wrapper.add_pyargv_item("py_%s" % self.name) self.wrapper.add_pyargv_item("py_%s" % self.name)
matcher.register_reverse('GstMiniObject*', GstMiniObjectParam) matcher.register_reverse('GstMiniObject*', GstMiniObjectParam)
class GstMiniObjectReturn(ReturnType): class GstMiniObjectReturn(ReturnType):
def get_c_type(self): def get_c_type(self):
return self.props.get('c_type', 'GstMiniObject *') return self.props.get('c_type', 'GstMiniObject *')
def write_decl(self): def write_decl(self):
self.wrapper.add_declaration("%s retval;" % self.get_c_type()) self.wrapper.add_declaration("%s retval;" % self.get_c_type())
def write_error_return(self): def write_error_return(self):
self.wrapper.write_code("return NULL;") self.wrapper.write_code("return NULL;")
def write_conversion(self): def write_conversion(self):
self.wrapper.write_code("retval = (%s) pygstminiobject_get(py_retval);" self.wrapper.write_code("retval = (%s) pygstminiobject_get(py_retval);"
% self.get_c_type()) % self.get_c_type())
self.wrapper.write_code("gst_mini_object_ref((GstMiniObject *) retval);") self.wrapper.write_code("gst_mini_object_ref((GstMiniObject *) retval);")
matcher.register_reverse_ret('GstMiniObject*', GstMiniObjectReturn) matcher.register_reverse_ret('GstMiniObject*', GstMiniObjectReturn)
@ -219,121 +219,121 @@ class GstCapsReturn(ReturnType):
## self.wrapper.write_code("gst_mini_object_ref((GstMiniObject *) retval);") ## self.wrapper.write_code("gst_mini_object_ref((GstMiniObject *) retval);")
matcher.register_reverse_ret('GstCaps*', GstCapsReturn) matcher.register_reverse_ret('GstCaps*', GstCapsReturn)
class Int64Param(Parameter): class Int64Param(Parameter):
def get_c_type(self): def get_c_type(self):
return self.props.get('c_type', 'gint64') return self.props.get('c_type', 'gint64')
def convert_c2py(self): def convert_c2py(self):
self.wrapper.add_declaration("PyObject *py_%s;" % self.name) self.wrapper.add_declaration("PyObject *py_%s;" % self.name)
self.wrapper.write_code(code=("py_%s = PyLong_FromLongLong(%s);" % self.wrapper.write_code(code=("py_%s = PyLong_FromLongLong(%s);" %
(self.name, self.name)), (self.name, self.name)),
cleanup=("Py_DECREF(py_%s);" % self.name)) cleanup=("Py_DECREF(py_%s);" % self.name))
self.wrapper.add_pyargv_item("py_%s" % self.name) self.wrapper.add_pyargv_item("py_%s" % self.name)
class Int64Return(ReturnType): class Int64Return(ReturnType):
def get_c_type(self): def get_c_type(self):
return self.props.get('c_type', 'gint64') return self.props.get('c_type', 'gint64')
def write_decl(self): def write_decl(self):
self.wrapper.add_declaration("%s retval;" % self.get_c_type()) self.wrapper.add_declaration("%s retval;" % self.get_c_type())
def write_error_return(self): def write_error_return(self):
self.wrapper.write_code("return -G_MAXINT;") self.wrapper.write_code("return -G_MAXINT;")
def write_conversion(self): def write_conversion(self):
self.wrapper.write_code( self.wrapper.write_code(
code=None, code=None,
failure_expression="!PyLong_Check(py_retval)", failure_expression="!PyLong_Check(py_retval)",
failure_cleanup='PyErr_SetString(PyExc_TypeError, "retval should be an long");') failure_cleanup='PyErr_SetString(PyExc_TypeError, "retval should be an long");')
self.wrapper.write_code("retval = PyLong_AsLongLong(py_retval);") self.wrapper.write_code("retval = PyLong_AsLongLong(py_retval);")
class UInt64Param(Parameter): class UInt64Param(Parameter):
def get_c_type(self): def get_c_type(self):
return self.props.get('c_type', 'guint64') return self.props.get('c_type', 'guint64')
def convert_c2py(self): def convert_c2py(self):
self.wrapper.add_declaration("PyObject *py_%s;" % self.name) self.wrapper.add_declaration("PyObject *py_%s;" % self.name)
self.wrapper.write_code(code=("py_%s = PyLong_FromUnsignedLongLong(%s);" % self.wrapper.write_code(code=("py_%s = PyLong_FromUnsignedLongLong(%s);" %
(self.name, self.name)), (self.name, self.name)),
cleanup=("Py_DECREF(py_%s);" % self.name)) cleanup=("Py_DECREF(py_%s);" % self.name))
self.wrapper.add_pyargv_item("py_%s" % self.name) self.wrapper.add_pyargv_item("py_%s" % self.name)
class UInt64Return(ReturnType): class UInt64Return(ReturnType):
def get_c_type(self): def get_c_type(self):
return self.props.get('c_type', 'guint64') return self.props.get('c_type', 'guint64')
def write_decl(self): def write_decl(self):
self.wrapper.add_declaration("%s retval;" % self.get_c_type()) self.wrapper.add_declaration("%s retval;" % self.get_c_type())
def write_error_return(self): def write_error_return(self):
self.wrapper.write_code("return -G_MAXINT;") self.wrapper.write_code("return -G_MAXINT;")
def write_conversion(self): def write_conversion(self):
self.wrapper.write_code( self.wrapper.write_code(
code=None, code=None,
failure_expression="!PyLong_Check(py_retval)", failure_expression="!PyLong_Check(py_retval)",
failure_cleanup='PyErr_SetString(PyExc_TypeError, "retval should be an long");') failure_cleanup='PyErr_SetString(PyExc_TypeError, "retval should be an long");')
self.wrapper.write_code("retval = PyLong_AsUnsignedLongLongMask(py_retval);") self.wrapper.write_code("retval = PyLong_AsUnsignedLongLongMask(py_retval);")
class ULongParam(Parameter): class ULongParam(Parameter):
def get_c_type(self): def get_c_type(self):
return self.props.get('c_type', 'gulong') return self.props.get('c_type', 'gulong')
def convert_c2py(self): def convert_c2py(self):
self.wrapper.add_declaration("PyObject *py_%s;" % self.name) self.wrapper.add_declaration("PyObject *py_%s;" % self.name)
self.wrapper.write_code(code=("py_%s = PyLong_FromUnsignedLong(%s);" % self.wrapper.write_code(code=("py_%s = PyLong_FromUnsignedLong(%s);" %
(self.name, self.name)), (self.name, self.name)),
cleanup=("Py_DECREF(py_%s);" % self.name)) cleanup=("Py_DECREF(py_%s);" % self.name))
self.wrapper.add_pyargv_item("py_%s" % self.name) self.wrapper.add_pyargv_item("py_%s" % self.name)
class ULongReturn(ReturnType): class ULongReturn(ReturnType):
def get_c_type(self): def get_c_type(self):
return self.props.get('c_type', 'gulong') return self.props.get('c_type', 'gulong')
def write_decl(self): def write_decl(self):
self.wrapper.add_declaration("%s retval;" % self.get_c_type()) self.wrapper.add_declaration("%s retval;" % self.get_c_type())
def write_error_return(self): def write_error_return(self):
self.wrapper.write_code("return -G_MAXINT;") self.wrapper.write_code("return -G_MAXINT;")
def write_conversion(self): def write_conversion(self):
self.wrapper.write_code( self.wrapper.write_code(
code=None, code=None,
failure_expression="!PyLong_Check(py_retval)", failure_expression="!PyLong_Check(py_retval)",
failure_cleanup='PyErr_SetString(PyExc_TypeError, "retval should be an long");') failure_cleanup='PyErr_SetString(PyExc_TypeError, "retval should be an long");')
self.wrapper.write_code("retval = PyLong_AsUnsignedLongMask(py_retval);") self.wrapper.write_code("retval = PyLong_AsUnsignedLongMask(py_retval);")
class ConstStringReturn(ReturnType): class ConstStringReturn(ReturnType):
def get_c_type(self): def get_c_type(self):
return "const gchar *" return "const gchar *"
def write_decl(self): def write_decl(self):
self.wrapper.add_declaration("const gchar *retval;") self.wrapper.add_declaration("const gchar *retval;")
def write_error_return(self): def write_error_return(self):
self.wrapper.write_code("return NULL;") self.wrapper.write_code("return NULL;")
def write_conversion(self): def write_conversion(self):
self.wrapper.write_code( self.wrapper.write_code(
code=None, code=None,
failure_expression="!PyString_Check(py_retval)", failure_expression="!PyString_Check(py_retval)",
failure_cleanup='PyErr_SetString(PyExc_TypeError, "retval should be a string");') failure_cleanup='PyErr_SetString(PyExc_TypeError, "retval should be a string");')
self.wrapper.write_code("retval = g_strdup(PyString_AsString(py_retval));") self.wrapper.write_code("retval = g_strdup(PyString_AsString(py_retval));")
class StringArrayArg(ArgType): class StringArrayArg(ArgType):
"""Arg type for NULL-terminated string pointer arrays (GStrv, aka gchar**).""" """Arg type for NULL-terminated string pointer arrays (GStrv, aka gchar**)."""
def write_return(self, ptype, ownsreturn, info): def write_return(self, ptype, ownsreturn, info):
if ownsreturn: if ownsreturn:
raise NotImplementedError () raise NotImplementedError ()
else: else:
info.varlist.add("gchar", "**ret") info.varlist.add("gchar", "**ret")
info.codeafter.append(" if (ret) {\n" info.codeafter.append(" if (ret) {\n"
" guint size = g_strv_length(ret);\n" " guint size = g_strv_length(ret);\n"
" PyObject *py_ret = PyTuple_New(size);\n" " PyObject *py_ret = PyTuple_New(size);\n"
" gint i;\n" " gint i;\n"
" for (i = 0; i < size; i++)\n" " for (i = 0; i < size; i++)\n"
" PyTuple_SetItem(py_ret, i,\n" " PyTuple_SetItem(py_ret, i,\n"
" PyString_FromString(ret[i]));\n" " PyString_FromString(ret[i]));\n"
" return py_ret;\n" " return py_ret;\n"
" }\n" " }\n"
" return PyTuple_New (0);\n") " return PyTuple_New (0);\n")
matcher.register('GstClockTime', UInt64Arg()) matcher.register('GstClockTime', UInt64Arg())
matcher.register('GstClockTimeDiff', Int64Arg()) matcher.register('GstClockTimeDiff', Int64Arg())