- Added a function MoviesTask, which is the same as the method but
with a null movie (giving time to all active movies)
- Made the graphics world parameter to SetMovieGWorld optional.
diff --git a/Mac/Modules/qt/Qtmodule.c b/Mac/Modules/qt/Qtmodule.c
index 51f1227..540915e 100644
--- a/Mac/Modules/qt/Qtmodule.c
+++ b/Mac/Modules/qt/Qtmodule.c
@@ -4300,7 +4300,7 @@
&gdh);
_res = Py_BuildValue("O&O&",
GrafObj_New, port,
- ResObj_New, gdh);
+ OptResObj_New, gdh);
return _res;
}
@@ -4313,7 +4313,7 @@
GDHandle gdh;
if (!PyArg_ParseTuple(_args, "O&O&",
GrafObj_Convert, &port,
- ResObj_Convert, &gdh))
+ OptResObj_Convert, &gdh))
return NULL;
SetMovieGWorld(_self->ob_itself,
port,
@@ -7650,6 +7650,22 @@
return _res;
}
+static PyObject *Qt_MoviesTask(_self, _args)
+ PyObject *_self;
+ PyObject *_args;
+{
+ PyObject *_res = NULL;
+ long maxMilliSecToUse;
+ if (!PyArg_ParseTuple(_args, "l",
+ &maxMilliSecToUse))
+ return NULL;
+ MoviesTask((Movie)0,
+ maxMilliSecToUse);
+ Py_INCREF(Py_None);
+ _res = Py_None;
+ return _res;
+}
+
static PyMethodDef Qt_methods[] = {
{"EnterMovies", (PyCFunction)Qt_EnterMovies, 1,
"() -> None"},
@@ -7787,6 +7803,8 @@
"(WindowPtr wp, Boolean front) -> None"},
{"DragAlignedWindow", (PyCFunction)Qt_DragAlignedWindow, 1,
"(WindowPtr wp, Point startPt, Rect boundsRect) -> None"},
+ {"MoviesTask", (PyCFunction)Qt_MoviesTask, 1,
+ "(long maxMilliSecToUse) -> None"},
{NULL, NULL, 0}
};
diff --git a/Mac/Modules/qt/qtsupport.py b/Mac/Modules/qt/qtsupport.py
index d90a246..2e26888 100644
--- a/Mac/Modules/qt/qtsupport.py
+++ b/Mac/Modules/qt/qtsupport.py
@@ -76,6 +76,7 @@
# Our (opaque) objects
Movie = OpaqueByValueType('Movie', 'MovieObj')
+NullMovie = FakeType("(Movie)0")
Track = OpaqueByValueType('Track', 'TrackObj')
Media = OpaqueByValueType('Media', 'MediaObj')
UserData = OpaqueByValueType('UserData', 'UserDataObj')
@@ -99,7 +100,7 @@
ImageDescriptionHandle = OpaqueByValueType("ImageDescriptionHandle", "ResObj")
TEHandle = OpaqueByValueType("TEHandle", "ResObj")
CGrafPtr = OpaqueByValueType("CGrafPtr", "GrafObj")
-GDHandle = OpaqueByValueType("GDHandle", "ResObj")
+GDHandle = OpaqueByValueType("GDHandle", "OptResObj")
AliasHandle = OpaqueByValueType("AliasHandle", "ResObj")
SoundDescriptionHandle = OpaqueByValueType("SoundDescriptionHandle", "ResObj")
# Silly Apple, passing an OStype by reference...
@@ -245,6 +246,13 @@
)
functions.append(f)
+# And we want the version of MoviesTask without a movie argument
+f = Function(void, 'MoviesTask',
+ (NullMovie, 'theMovie', InMode),
+ (long, 'maxMilliSecToUse', InMode),
+)
+functions.append(f)
+
# add the populated lists to the generator groups
# (in a different wordl the scan program would generate this)