[Python-checkins] python/dist/src/Mac/Modules/qt _Qtmodule.c, 1.17, 1.18 qtscan.py, 1.22, 1.23 qtsupport.py, 1.22, 1.23

[jackjansen at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Mac/Modules/qt
In directory sc8-pr-cvs1:/tmp/cvs-serv18235

Modified Files:
	_Qtmodule.c qtscan.py qtsupport.py 
Log Message:
Updated for QuickTime 6.0, Universal Header 3.4.2.


Index: _Qtmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/qt/_Qtmodule.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** _Qtmodule.c	20 Nov 2003 13:30:58 -0000	1.17
--- _Qtmodule.c	2 Jan 2004 23:27:42 -0000	1.18
***************
*** 84,87 ****
--- 84,205 ----
  static PyObject *Qt_Error;
  
+ /* -------------------- Object type IdleManager --------------------- */
+ 
+ PyTypeObject IdleManager_Type;
+ 
+ #define IdleManagerObj_Check(x) ((x)->ob_type == &IdleManager_Type || PyObject_TypeCheck((x), &IdleManager_Type))
+ 
+ typedef struct IdleManagerObject {
[...1029 lines suppressed...]
+ 	{"SpriteMediaImageIndexToID", (PyCFunction)Qt_SpriteMediaImageIndexToID, 1,
+ 	 PyDoc_STR("(MediaHandler mh, short imageIndex) -> (ComponentResult _rv, QTAtomID imageID)")},
+ 	{"SpriteMediaImageIDToIndex", (PyCFunction)Qt_SpriteMediaImageIDToIndex, 1,
+ 	 PyDoc_STR("(MediaHandler mh, QTAtomID imageID) -> (ComponentResult _rv, short imageIndex)")},
  	{"FlashMediaSetPan", (PyCFunction)Qt_FlashMediaSetPan, 1,
  	 PyDoc_STR("(MediaHandler mh, short xPercent, short yPercent) -> (ComponentResult _rv)")},
***************
*** 9732,9735 ****
--- 10523,10533 ----
  	    PyDict_SetItemString(d, "Error", Qt_Error) != 0)
  		return;
+ 	IdleManager_Type.ob_type = &PyType_Type;
+ 	if (PyType_Ready(&IdleManager_Type) < 0) return;
+ 	Py_INCREF(&IdleManager_Type);
+ 	PyModule_AddObject(m, "IdleManager", (PyObject *)&IdleManager_Type);
+ 	/* Backward-compatible name */
+ 	Py_INCREF(&IdleManager_Type);
+ 	PyModule_AddObject(m, "IdleManagerType", (PyObject *)&IdleManager_Type);
  	MovieController_Type.ob_type = &PyType_Type;
  	if (PyType_Ready(&MovieController_Type) < 0) return;

Index: qtscan.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/qt/qtscan.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** qtscan.py	4 Feb 2003 15:35:07 -0000	1.22
--- qtscan.py	2 Jan 2004 23:27:42 -0000	1.23
***************
*** 9,13 ****
  LONG = "QuickTime"
  SHORT = "qt"
! OBJECTS = ("Movie", "Track", "Media", "UserData", "TimeBase", "MovieController")
  
  def main():
--- 9,13 ----
  LONG = "QuickTime"
  SHORT = "qt"
! OBJECTS = ("Movie", "Track", "Media", "UserData", "TimeBase", "MovieController", "IdleManager")
  
  def main():
***************
*** 92,95 ****
--- 92,99 ----
  			"SampleReferencePtr",
  			"QTTweener",
+ 			"QTErrorReplacementPtr",
+ 			"QTRestrictionSet",
+ 			"QTUUID",
+ 			"QTUUID_ptr",
  
  			# Routine pointers, not yet.
***************
*** 110,113 ****
--- 114,118 ----
  			"QTBandwidthNotificationUPP",
  			"DoMCActionUPP",
+ 			"QTNextTaskNeededSoonerCallbackUPP",
  			
  			"SampleReference64Ptr",	# Don't know what this does, yet

Index: qtsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/qt/qtsupport.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** qtsupport.py	19 Nov 2003 16:13:33 -0000	1.22
--- qtsupport.py	2 Jan 2004 23:27:42 -0000	1.23
***************
*** 116,119 ****
--- 116,120 ----
  TimeBase = OpaqueByValueType('TimeBase', 'TimeBaseObj')
  MovieController = OpaqueByValueType('MovieController', 'MovieCtlObj')
+ IdleManager = OpaqueByValueType('IdleManager', 'IdleManagerObj')
  
  # Other opaque objects
***************
*** 231,234 ****
--- 232,242 ----
  		Output("DisposeMovieController(%s);", itselfname)
  
+ class IdleManagerObjectDefinition(PEP253Mixin, GlobalObjectDefinition):
+ 	def outputCheckNewArg(self):
+ 		Output("""if (itself == NULL) {
+ 					PyErr_SetString(Qt_Error,"Cannot create null IdleManager");
+ 					return NULL;
+ 				}""")
+ 
  # From here on it's basically all boiler plate...
  
***************
*** 241,245 ****
--- 249,255 ----
  TimeBase_object = TimeBaseObjectDefinition('TimeBase', 'TimeBaseObj', 'TimeBase')
  MovieController_object = MovieCtlObjectDefinition('MovieController', 'MovieCtlObj', 'MovieController')
+ IdleManager_object = IdleManagerObjectDefinition('IdleManager', 'IdleManagerObj', 'IdleManager')
  
+ module.addobject(IdleManager_object)
  module.addobject(MovieController_object)
  module.addobject(TimeBase_object)
***************
*** 255,258 ****
--- 265,269 ----
  # Create and populate the lists
  functions = []
+ IdleManager_methods = []
  MovieController_methods = []
  TimeBase_methods = []