]> granicus.if.org Git - python/commitdiff
More cases of input parameters passed by reference without const.
authorJack Jansen <jack.jansen@cwi.nl>
Sun, 11 Jan 2004 22:52:12 +0000 (22:52 +0000)
committerJack Jansen <jack.jansen@cwi.nl>
Sun, 11 Jan 2004 22:52:12 +0000 (22:52 +0000)
Mac/Modules/qt/_Qtmodule.c
Mac/Modules/qt/qtscan.py
Mac/Modules/qt/qtsupport.py

index b201021d6f83eeadaafe2c2e6bba7c8c44c1c13b..50223eceed7d975d96fc2b3a4065e9f308a06b33 100644 (file)
@@ -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,
index 175a22052661a6c5bc6fea9cb9835a529a4b93f8..1006c6c73600376059838fe67ed85a25793a5aef 100644 (file)
@@ -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__":
index 098d30d6dfcfd587811963c659ea201464aee001..20304c98b60cba469afca40d242b8b0216d6f5a5 100644 (file)
@@ -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")