summaryrefslogtreecommitdiffstats
path: root/Mac
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2004-01-11 22:52:12 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2004-01-11 22:52:12 (GMT)
commit69387e19ef2c8f8f920de29087e42e52640db1ee (patch)
tree6d7fc7bed6c87eac76546a886a405a38ca2b86e6 /Mac
parentae57b7f8437693cd27eb4b1a1ceea2008fc37f48 (diff)
downloadcpython-69387e19ef2c8f8f920de29087e42e52640db1ee.zip
cpython-69387e19ef2c8f8f920de29087e42e52640db1ee.tar.gz
cpython-69387e19ef2c8f8f920de29087e42e52640db1ee.tar.bz2
More cases of input parameters passed by reference without const.
Diffstat (limited to 'Mac')
-rw-r--r--Mac/Modules/qt/_Qtmodule.c30
-rw-r--r--Mac/Modules/qt/qtscan.py3
-rw-r--r--Mac/Modules/qt/qtsupport.py1
3 files changed, 19 insertions, 15 deletions
diff --git a/Mac/Modules/qt/_Qtmodule.c b/Mac/Modules/qt/_Qtmodule.c
index b201021..50223ec 100644
--- a/Mac/Modules/qt/_Qtmodule.c
+++ b/Mac/Modules/qt/_Qtmodule.c
@@ -25835,18 +25835,18 @@ static PyObject *Qt_TuneSetHeader(PyObject *_self, PyObject *_args)
PyObject *_res = NULL;
ComponentResult _rv;
TunePlayer tp;
- unsigned long header;
+ unsigned long * header;
#ifndef TuneSetHeader
PyMac_PRECHECK(TuneSetHeader);
#endif
- if (!PyArg_ParseTuple(_args, "O&",
- CmpInstObj_Convert, &tp))
+ if (!PyArg_ParseTuple(_args, "O&s",
+ CmpInstObj_Convert, &tp,
+ &header))
return NULL;
_rv = TuneSetHeader(tp,
- &header);
- _res = Py_BuildValue("ll",
- _rv,
- header);
+ header);
+ _res = Py_BuildValue("l",
+ _rv);
return _res;
}
@@ -26149,21 +26149,21 @@ static PyObject *Qt_TuneSetHeaderWithSize(PyObject *_self, PyObject *_args)
PyObject *_res = NULL;
ComponentResult _rv;
TunePlayer tp;
- unsigned long header;
+ unsigned long * header;
unsigned long size;
#ifndef TuneSetHeaderWithSize
PyMac_PRECHECK(TuneSetHeaderWithSize);
#endif
- if (!PyArg_ParseTuple(_args, "O&l",
+ if (!PyArg_ParseTuple(_args, "O&sl",
CmpInstObj_Convert, &tp,
+ &header,
&size))
return NULL;
_rv = TuneSetHeaderWithSize(tp,
- &header,
+ header,
size);
- _res = Py_BuildValue("ll",
- _rv,
- header);
+ _res = Py_BuildValue("l",
+ _rv);
return _res;
}
@@ -27937,7 +27937,7 @@ static PyMethodDef Qt_methods[] = {
{"NATask", (PyCFunction)Qt_NATask, 1,
PyDoc_STR("(NoteAllocator na) -> (ComponentResult _rv)")},
{"TuneSetHeader", (PyCFunction)Qt_TuneSetHeader, 1,
- PyDoc_STR("(TunePlayer tp) -> (ComponentResult _rv, unsigned long header)")},
+ PyDoc_STR("(TunePlayer tp, unsigned long * header) -> (ComponentResult _rv)")},
{"TuneGetTimeBase", (PyCFunction)Qt_TuneGetTimeBase, 1,
PyDoc_STR("(TunePlayer tp) -> (ComponentResult _rv, TimeBase tb)")},
{"TuneSetTimeScale", (PyCFunction)Qt_TuneSetTimeScale, 1,
@@ -27969,7 +27969,7 @@ static PyMethodDef Qt_methods[] = {
{"TuneSetSoundLocalization", (PyCFunction)Qt_TuneSetSoundLocalization, 1,
PyDoc_STR("(TunePlayer tp, Handle data) -> (ComponentResult _rv)")},
{"TuneSetHeaderWithSize", (PyCFunction)Qt_TuneSetHeaderWithSize, 1,
- PyDoc_STR("(TunePlayer tp, unsigned long size) -> (ComponentResult _rv, unsigned long header)")},
+ PyDoc_STR("(TunePlayer tp, unsigned long * header, unsigned long size) -> (ComponentResult _rv)")},
{"TuneSetPartMix", (PyCFunction)Qt_TuneSetPartMix, 1,
PyDoc_STR("(TunePlayer tp, unsigned long partNumber, long volume, long balance, long mixFlags) -> (ComponentResult _rv)")},
{"TuneGetPartMix", (PyCFunction)Qt_TuneGetPartMix, 1,
diff --git a/Mac/Modules/qt/qtscan.py b/Mac/Modules/qt/qtscan.py
index 175a220..1006c6c 100644
--- a/Mac/Modules/qt/qtscan.py
+++ b/Mac/Modules/qt/qtscan.py
@@ -306,6 +306,9 @@ class MyScanner(Scanner):
# It seems MusicMIDIPacket if never flagged with const but always used
# for sending only. If that ever changes this needs to be fixed.
([('MusicMIDIPacket', '*', 'OutMode')], [('MusicMIDIPacket_ptr', '*', 'InMode')]),
+
+ # QTMusic const-less input parameters
+ ([('unsigned_long', 'header', 'OutMode')], [('UnsignedLongPtr', 'header', 'InMode')]),
]
if __name__ == "__main__":
diff --git a/Mac/Modules/qt/qtsupport.py b/Mac/Modules/qt/qtsupport.py
index 098d30d..20304c9 100644
--- a/Mac/Modules/qt/qtsupport.py
+++ b/Mac/Modules/qt/qtsupport.py
@@ -211,6 +211,7 @@ VideoDigitizerError = Type("ComponentResult", "l")
HandlerError = Type("HandlerError", "l")
Ptr = InputOnlyType("Ptr", "s")
StringPtr = Type("StringPtr", "s")
+UnsignedLongPtr = Type("unsigned long *", "s")
mcactionparams = InputOnlyType("void *", "s")
QTParameterDialog = Type("QTParameterDialog", "l")
QTAtomID = Type("QTAtomID", "l")