diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2000-03-06 16:34:49 +0000 |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2000-03-06 16:34:49 +0000 |
| commit | 2971ffbb9042bd8dc8d44829db13c29eae50f051 (patch) | |
| tree | a3afcd64114af75a8b9a1498ebc6d843a01ec559 /Mac/Modules/qt | |
| parent | 7c1655ba60e588fbefbfed9b36d8117957ed5fba (diff) | |
| download | cpython-2971ffbb9042bd8dc8d44829db13c29eae50f051.tar.gz | |
Allow None as TimeBase value in TimeValue records (becomes NULL in C structure,
used for delta-t values by quicktime).
Diffstat (limited to 'Mac/Modules/qt')
| -rw-r--r-- | Mac/Modules/qt/Qtmodule.c | 18 | ||||
| -rw-r--r-- | Mac/Modules/qt/qtsupport.py | 18 |
2 files changed, 26 insertions, 10 deletions
diff --git a/Mac/Modules/qt/Qtmodule.c b/Mac/Modules/qt/Qtmodule.c index 36c3efa88c..d374b45a40 100644 --- a/Mac/Modules/qt/Qtmodule.c +++ b/Mac/Modules/qt/Qtmodule.c @@ -71,9 +71,12 @@ static PyObject * QtTimeRecord_New(itself) TimeRecord *itself; { - - return Py_BuildValue("O&lO&", PyMac_Buildwide, &itself->value, itself->scale, + if (itself->base) + return Py_BuildValue("O&lO&", PyMac_Buildwide, &itself->value, itself->scale, TimeBaseObj_New, itself->base); + else + return Py_BuildValue("O&lO", PyMac_Buildwide, &itself->value, itself->scale, + Py_None); } static int @@ -81,10 +84,15 @@ QtTimeRecord_Convert(v, p_itself) PyObject *v; TimeRecord *p_itself; { - - if( !PyArg_ParseTuple(v, "O&lO&", PyMac_Getwide, &p_itself->value, &p_itself->scale, - TimeBaseObj_Convert, &p_itself->base) ) + PyObject *base = NULL; + if( !PyArg_ParseTuple(v, "O&l|O", PyMac_Getwide, &p_itself->value, &p_itself->scale, + &base) ) return 0; + if ( base == NULL || base == Py_None ) + p_itself->base = NULL; + else + if ( !TimeBaseObj_Convert(base, &p_itself->base) ) + return 0; return 1; } diff --git a/Mac/Modules/qt/qtsupport.py b/Mac/Modules/qt/qtsupport.py index 2e26888bfc..f4186f7a10 100644 --- a/Mac/Modules/qt/qtsupport.py +++ b/Mac/Modules/qt/qtsupport.py @@ -53,9 +53,12 @@ static PyObject * QtTimeRecord_New(itself) TimeRecord *itself; { - - return Py_BuildValue("O&lO&", PyMac_Buildwide, &itself->value, itself->scale, + if (itself->base) + return Py_BuildValue("O&lO&", PyMac_Buildwide, &itself->value, itself->scale, TimeBaseObj_New, itself->base); + else + return Py_BuildValue("O&lO", PyMac_Buildwide, &itself->value, itself->scale, + Py_None); } static int @@ -63,10 +66,15 @@ QtTimeRecord_Convert(v, p_itself) PyObject *v; TimeRecord *p_itself; { - - if( !PyArg_ParseTuple(v, "O&lO&", PyMac_Getwide, &p_itself->value, &p_itself->scale, - TimeBaseObj_Convert, &p_itself->base) ) + PyObject *base = NULL; + if( !PyArg_ParseTuple(v, "O&l|O", PyMac_Getwide, &p_itself->value, &p_itself->scale, + &base) ) return 0; + if ( base == NULL || base == Py_None ) + p_itself->base = NULL; + else + if ( !TimeBaseObj_Convert(base, &p_itself->base) ) + return 0; return 1; } |