[Python-checkins] r70715 - in python/branches/release26-maint: Mac/Modules/qt/_Qtmodule.c Mac/Modules/qt/qtsupport.py
ronald.oussoren
python-checkins at python.org
Mon Mar 30 17:24:09 CEST 2009
Author: ronald.oussoren
Date: Mon Mar 30 17:24:08 2009
New Revision: 70715
Log:
Merged revisions 70713 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70713 | ronald.oussoren | 2009-03-30 10:20:46 -0500 (Mon, 30 Mar 2009) | 2 lines
This patch fixes issue 1254695 (wrong argument type conversion in Carbon.Qt)
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Mac/Modules/qt/_Qtmodule.c
python/branches/release26-maint/Mac/Modules/qt/qtsupport.py
Modified: python/branches/release26-maint/Mac/Modules/qt/_Qtmodule.c
==============================================================================
--- python/branches/release26-maint/Mac/Modules/qt/_Qtmodule.c (original)
+++ python/branches/release26-maint/Mac/Modules/qt/_Qtmodule.c Mon Mar 30 17:24:08 2009
@@ -11551,7 +11551,7 @@
PyMac_PRECHECK(GraphicsImportSetDataReference);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &dataRef,
PyMac_GetOSType, &dataReType))
return NULL;
@@ -11574,7 +11574,7 @@
PyMac_PRECHECK(GraphicsImportGetDataReference);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetDataReference(ci,
&dataRef,
@@ -11596,7 +11596,7 @@
PyMac_PRECHECK(GraphicsImportSetDataFile);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetFSSpec, &theFile))
return NULL;
_rv = GraphicsImportSetDataFile(ci,
@@ -11616,7 +11616,7 @@
PyMac_PRECHECK(GraphicsImportGetDataFile);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetFSSpec, &theFile))
return NULL;
_rv = GraphicsImportGetDataFile(ci,
@@ -11636,7 +11636,7 @@
PyMac_PRECHECK(GraphicsImportSetDataHandle);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &h))
return NULL;
_rv = GraphicsImportSetDataHandle(ci,
@@ -11656,7 +11656,7 @@
PyMac_PRECHECK(GraphicsImportGetDataHandle);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetDataHandle(ci,
&h);
@@ -11676,7 +11676,7 @@
PyMac_PRECHECK(GraphicsImportGetImageDescription);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetImageDescription(ci,
&desc);
@@ -11697,7 +11697,7 @@
PyMac_PRECHECK(GraphicsImportGetDataOffsetAndSize);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetDataOffsetAndSize(ci,
&offset,
@@ -11721,7 +11721,7 @@
PyMac_PRECHECK(GraphicsImportReadData);
#endif
if (!PyArg_ParseTuple(_args, "O&sll",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&dataPtr,
&dataOffset,
&dataSize))
@@ -11745,7 +11745,7 @@
PyMac_PRECHECK(GraphicsImportSetClip);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &clipRgn))
return NULL;
_rv = GraphicsImportSetClip(ci,
@@ -11765,7 +11765,7 @@
PyMac_PRECHECK(GraphicsImportGetClip);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetClip(ci,
&clipRgn);
@@ -11785,7 +11785,7 @@
PyMac_PRECHECK(GraphicsImportSetSourceRect);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetRect, &sourceRect))
return NULL;
_rv = GraphicsImportSetSourceRect(ci,
@@ -11805,7 +11805,7 @@
PyMac_PRECHECK(GraphicsImportGetSourceRect);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetSourceRect(ci,
&sourceRect);
@@ -11825,7 +11825,7 @@
PyMac_PRECHECK(GraphicsImportGetNaturalBounds);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetNaturalBounds(ci,
&naturalBounds);
@@ -11844,7 +11844,7 @@
PyMac_PRECHECK(GraphicsImportDraw);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportDraw(ci);
_res = Py_BuildValue("l",
@@ -11863,7 +11863,7 @@
PyMac_PRECHECK(GraphicsImportSetGWorld);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
GrafObj_Convert, &port,
OptResObj_Convert, &gd))
return NULL;
@@ -11886,7 +11886,7 @@
PyMac_PRECHECK(GraphicsImportGetGWorld);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetGWorld(ci,
&port,
@@ -11908,7 +11908,7 @@
PyMac_PRECHECK(GraphicsImportSetBoundsRect);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetRect, &bounds))
return NULL;
_rv = GraphicsImportSetBoundsRect(ci,
@@ -11928,7 +11928,7 @@
PyMac_PRECHECK(GraphicsImportGetBoundsRect);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetBoundsRect(ci,
&bounds);
@@ -11949,7 +11949,7 @@
PyMac_PRECHECK(GraphicsImportSaveAsPicture);
#endif
if (!PyArg_ParseTuple(_args, "O&O&h",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetFSSpec, &fss,
&scriptTag))
return NULL;
@@ -11972,7 +11972,7 @@
PyMac_PRECHECK(GraphicsImportSetGraphicsMode);
#endif
if (!PyArg_ParseTuple(_args, "O&lO&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&graphicsMode,
QdRGB_Convert, &opColor))
return NULL;
@@ -11995,7 +11995,7 @@
PyMac_PRECHECK(GraphicsImportGetGraphicsMode);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetGraphicsMode(ci,
&graphicsMode,
@@ -12017,7 +12017,7 @@
PyMac_PRECHECK(GraphicsImportSetQuality);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&quality))
return NULL;
_rv = GraphicsImportSetQuality(ci,
@@ -12037,7 +12037,7 @@
PyMac_PRECHECK(GraphicsImportGetQuality);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetQuality(ci,
&quality);
@@ -12058,7 +12058,7 @@
PyMac_PRECHECK(GraphicsImportSaveAsQuickTimeImageFile);
#endif
if (!PyArg_ParseTuple(_args, "O&O&h",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetFSSpec, &fss,
&scriptTag))
return NULL;
@@ -12081,7 +12081,7 @@
PyMac_PRECHECK(GraphicsImportSetDataReferenceOffsetAndLimit);
#endif
if (!PyArg_ParseTuple(_args, "O&ll",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&offset,
&limit))
return NULL;
@@ -12104,7 +12104,7 @@
PyMac_PRECHECK(GraphicsImportGetDataReferenceOffsetAndLimit);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetDataReferenceOffsetAndLimit(ci,
&offset,
@@ -12127,7 +12127,7 @@
PyMac_PRECHECK(GraphicsImportGetAliasedDataReference);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetAliasedDataReference(ci,
&dataRef,
@@ -12149,7 +12149,7 @@
PyMac_PRECHECK(GraphicsImportValidate);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportValidate(ci,
&valid);
@@ -12169,7 +12169,7 @@
PyMac_PRECHECK(GraphicsImportGetMetaData);
#endif
if (!PyArg_ParseTuple(_args, "O&s",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&userData))
return NULL;
_rv = GraphicsImportGetMetaData(ci,
@@ -12189,7 +12189,7 @@
PyMac_PRECHECK(GraphicsImportGetMIMETypeList);
#endif
if (!PyArg_ParseTuple(_args, "O&s",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&qtAtomContainerPtr))
return NULL;
_rv = GraphicsImportGetMIMETypeList(ci,
@@ -12209,7 +12209,7 @@
PyMac_PRECHECK(GraphicsImportDoesDrawAllPixels);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportDoesDrawAllPixels(ci,
&drawsAllPixels);
@@ -12229,7 +12229,7 @@
PyMac_PRECHECK(GraphicsImportGetAsPicture);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetAsPicture(ci,
&picture);
@@ -12252,7 +12252,7 @@
PyMac_PRECHECK(GraphicsImportExportImageFile);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&O&h",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetOSType, &fileType,
PyMac_GetOSType, &fileCreator,
PyMac_GetFSSpec, &fss,
@@ -12278,7 +12278,7 @@
PyMac_PRECHECK(GraphicsImportGetExportImageTypeList);
#endif
if (!PyArg_ParseTuple(_args, "O&s",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&qtAtomContainerPtr))
return NULL;
_rv = GraphicsImportGetExportImageTypeList(ci,
@@ -12298,7 +12298,7 @@
PyMac_PRECHECK(GraphicsImportGetExportSettingsAsAtomContainer);
#endif
if (!PyArg_ParseTuple(_args, "O&s",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&qtAtomContainerPtr))
return NULL;
_rv = GraphicsImportGetExportSettingsAsAtomContainer(ci,
@@ -12318,7 +12318,7 @@
PyMac_PRECHECK(GraphicsImportSetExportSettingsFromAtomContainer);
#endif
if (!PyArg_ParseTuple(_args, "O&s",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&qtAtomContainer))
return NULL;
_rv = GraphicsImportSetExportSettingsFromAtomContainer(ci,
@@ -12338,7 +12338,7 @@
PyMac_PRECHECK(GraphicsImportGetImageCount);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetImageCount(ci,
&imageCount);
@@ -12358,7 +12358,7 @@
PyMac_PRECHECK(GraphicsImportSetImageIndex);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&imageIndex))
return NULL;
_rv = GraphicsImportSetImageIndex(ci,
@@ -12378,7 +12378,7 @@
PyMac_PRECHECK(GraphicsImportGetImageIndex);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetImageIndex(ci,
&imageIndex);
@@ -12399,7 +12399,7 @@
PyMac_PRECHECK(GraphicsImportGetDataOffsetAndSize64);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetDataOffsetAndSize64(ci,
&offset,
@@ -12423,7 +12423,7 @@
PyMac_PRECHECK(GraphicsImportReadData64);
#endif
if (!PyArg_ParseTuple(_args, "O&sO&l",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&dataPtr,
PyMac_Getwide, &dataOffset,
&dataSize))
@@ -12448,7 +12448,7 @@
PyMac_PRECHECK(GraphicsImportSetDataReferenceOffsetAndLimit64);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_Getwide, &offset,
PyMac_Getwide, &limit))
return NULL;
@@ -12471,7 +12471,7 @@
PyMac_PRECHECK(GraphicsImportGetDataReferenceOffsetAndLimit64);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetDataReferenceOffsetAndLimit64(ci,
&offset,
@@ -12493,7 +12493,7 @@
PyMac_PRECHECK(GraphicsImportGetDefaultClip);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetDefaultClip(ci,
&defaultRgn);
@@ -12514,7 +12514,7 @@
PyMac_PRECHECK(GraphicsImportGetDefaultGraphicsMode);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetDefaultGraphicsMode(ci,
&defaultGraphicsMode,
@@ -12536,7 +12536,7 @@
PyMac_PRECHECK(GraphicsImportGetDefaultSourceRect);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetDefaultSourceRect(ci,
&defaultSourceRect);
@@ -12556,7 +12556,7 @@
PyMac_PRECHECK(GraphicsImportGetColorSyncProfile);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetColorSyncProfile(ci,
&profile);
@@ -12576,7 +12576,7 @@
PyMac_PRECHECK(GraphicsImportSetDestRect);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetRect, &destRect))
return NULL;
_rv = GraphicsImportSetDestRect(ci,
@@ -12596,7 +12596,7 @@
PyMac_PRECHECK(GraphicsImportGetDestRect);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetDestRect(ci,
&destRect);
@@ -12616,7 +12616,7 @@
PyMac_PRECHECK(GraphicsImportSetFlags);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&flags))
return NULL;
_rv = GraphicsImportSetFlags(ci,
@@ -12636,7 +12636,7 @@
PyMac_PRECHECK(GraphicsImportGetFlags);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetFlags(ci,
&flags);
@@ -12657,7 +12657,7 @@
PyMac_PRECHECK(GraphicsImportGetBaseDataOffsetAndSize64);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportGetBaseDataOffsetAndSize64(ci,
&offset,
@@ -12678,7 +12678,7 @@
PyMac_PRECHECK(GraphicsImportSetImageIndexToThumbnail);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImportSetImageIndexToThumbnail(ci);
_res = Py_BuildValue("l",
@@ -12696,7 +12696,7 @@
PyMac_PRECHECK(GraphicsExportDoExport);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportDoExport(ci,
&actualSizeWritten);
@@ -12716,7 +12716,7 @@
PyMac_PRECHECK(GraphicsExportCanTranscode);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportCanTranscode(ci,
&canTranscode);
@@ -12735,7 +12735,7 @@
PyMac_PRECHECK(GraphicsExportDoTranscode);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportDoTranscode(ci);
_res = Py_BuildValue("l",
@@ -12754,7 +12754,7 @@
PyMac_PRECHECK(GraphicsExportCanUseCompressor);
#endif
if (!PyArg_ParseTuple(_args, "O&s",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&codecSettingsAtomContainerPtr))
return NULL;
_rv = GraphicsExportCanUseCompressor(ci,
@@ -12777,7 +12777,7 @@
PyMac_PRECHECK(GraphicsExportDoUseCompressor);
#endif
if (!PyArg_ParseTuple(_args, "O&s",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&codecSettingsAtomContainer))
return NULL;
_rv = GraphicsExportDoUseCompressor(ci,
@@ -12798,7 +12798,7 @@
PyMac_PRECHECK(GraphicsExportDoStandaloneExport);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportDoStandaloneExport(ci);
_res = Py_BuildValue("l",
@@ -12817,7 +12817,7 @@
PyMac_PRECHECK(GraphicsExportGetDefaultFileTypeAndCreator);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetDefaultFileTypeAndCreator(ci,
&fileType,
@@ -12839,7 +12839,7 @@
PyMac_PRECHECK(GraphicsExportGetDefaultFileNameExtension);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetDefaultFileNameExtension(ci,
&fileNameExtension);
@@ -12859,7 +12859,7 @@
PyMac_PRECHECK(GraphicsExportGetMIMETypeList);
#endif
if (!PyArg_ParseTuple(_args, "O&s",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&qtAtomContainerPtr))
return NULL;
_rv = GraphicsExportGetMIMETypeList(ci,
@@ -12879,7 +12879,7 @@
PyMac_PRECHECK(GraphicsExportSetSettingsFromAtomContainer);
#endif
if (!PyArg_ParseTuple(_args, "O&s",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&qtAtomContainer))
return NULL;
_rv = GraphicsExportSetSettingsFromAtomContainer(ci,
@@ -12899,7 +12899,7 @@
PyMac_PRECHECK(GraphicsExportGetSettingsAsAtomContainer);
#endif
if (!PyArg_ParseTuple(_args, "O&s",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&qtAtomContainerPtr))
return NULL;
_rv = GraphicsExportGetSettingsAsAtomContainer(ci,
@@ -12919,7 +12919,7 @@
PyMac_PRECHECK(GraphicsExportGetSettingsAsText);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetSettingsAsText(ci,
&theText);
@@ -12939,7 +12939,7 @@
PyMac_PRECHECK(GraphicsExportSetDontRecompress);
#endif
if (!PyArg_ParseTuple(_args, "O&b",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&dontRecompress))
return NULL;
_rv = GraphicsExportSetDontRecompress(ci,
@@ -12959,7 +12959,7 @@
PyMac_PRECHECK(GraphicsExportGetDontRecompress);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetDontRecompress(ci,
&dontRecompress);
@@ -12979,7 +12979,7 @@
PyMac_PRECHECK(GraphicsExportSetInterlaceStyle);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&interlaceStyle))
return NULL;
_rv = GraphicsExportSetInterlaceStyle(ci,
@@ -12999,7 +12999,7 @@
PyMac_PRECHECK(GraphicsExportGetInterlaceStyle);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetInterlaceStyle(ci,
&interlaceStyle);
@@ -13019,7 +13019,7 @@
PyMac_PRECHECK(GraphicsExportSetMetaData);
#endif
if (!PyArg_ParseTuple(_args, "O&s",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&userData))
return NULL;
_rv = GraphicsExportSetMetaData(ci,
@@ -13039,7 +13039,7 @@
PyMac_PRECHECK(GraphicsExportGetMetaData);
#endif
if (!PyArg_ParseTuple(_args, "O&s",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&userData))
return NULL;
_rv = GraphicsExportGetMetaData(ci,
@@ -13059,7 +13059,7 @@
PyMac_PRECHECK(GraphicsExportSetTargetDataSize);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&targetDataSize))
return NULL;
_rv = GraphicsExportSetTargetDataSize(ci,
@@ -13079,7 +13079,7 @@
PyMac_PRECHECK(GraphicsExportGetTargetDataSize);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetTargetDataSize(ci,
&targetDataSize);
@@ -13099,7 +13099,7 @@
PyMac_PRECHECK(GraphicsExportSetCompressionMethod);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&compressionMethod))
return NULL;
_rv = GraphicsExportSetCompressionMethod(ci,
@@ -13119,7 +13119,7 @@
PyMac_PRECHECK(GraphicsExportGetCompressionMethod);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetCompressionMethod(ci,
&compressionMethod);
@@ -13139,7 +13139,7 @@
PyMac_PRECHECK(GraphicsExportSetCompressionQuality);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&spatialQuality))
return NULL;
_rv = GraphicsExportSetCompressionQuality(ci,
@@ -13159,7 +13159,7 @@
PyMac_PRECHECK(GraphicsExportGetCompressionQuality);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetCompressionQuality(ci,
&spatialQuality);
@@ -13180,7 +13180,7 @@
PyMac_PRECHECK(GraphicsExportSetResolution);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetFixed, &horizontalResolution,
PyMac_GetFixed, &verticalResolution))
return NULL;
@@ -13203,7 +13203,7 @@
PyMac_PRECHECK(GraphicsExportGetResolution);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetResolution(ci,
&horizontalResolution,
@@ -13225,7 +13225,7 @@
PyMac_PRECHECK(GraphicsExportSetDepth);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&depth))
return NULL;
_rv = GraphicsExportSetDepth(ci,
@@ -13245,7 +13245,7 @@
PyMac_PRECHECK(GraphicsExportGetDepth);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetDepth(ci,
&depth);
@@ -13265,7 +13265,7 @@
PyMac_PRECHECK(GraphicsExportSetColorSyncProfile);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &colorSyncProfile))
return NULL;
_rv = GraphicsExportSetColorSyncProfile(ci,
@@ -13285,7 +13285,7 @@
PyMac_PRECHECK(GraphicsExportGetColorSyncProfile);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetColorSyncProfile(ci,
&colorSyncProfile);
@@ -13307,7 +13307,7 @@
PyMac_PRECHECK(GraphicsExportSetInputDataReference);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &dataRef,
PyMac_GetOSType, &dataRefType,
ResObj_Convert, &desc))
@@ -13332,7 +13332,7 @@
PyMac_PRECHECK(GraphicsExportGetInputDataReference);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetInputDataReference(ci,
&dataRef,
@@ -13355,7 +13355,7 @@
PyMac_PRECHECK(GraphicsExportSetInputFile);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetFSSpec, &theFile,
ResObj_Convert, &desc))
return NULL;
@@ -13377,7 +13377,7 @@
PyMac_PRECHECK(GraphicsExportGetInputFile);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetFSSpec, &theFile))
return NULL;
_rv = GraphicsExportGetInputFile(ci,
@@ -13398,7 +13398,7 @@
PyMac_PRECHECK(GraphicsExportSetInputHandle);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &h,
ResObj_Convert, &desc))
return NULL;
@@ -13420,7 +13420,7 @@
PyMac_PRECHECK(GraphicsExportGetInputHandle);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetInputHandle(ci,
&h);
@@ -13442,7 +13442,7 @@
PyMac_PRECHECK(GraphicsExportSetInputPtr);
#endif
if (!PyArg_ParseTuple(_args, "O&slO&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&p,
&size,
ResObj_Convert, &desc))
@@ -13466,8 +13466,8 @@
PyMac_PRECHECK(GraphicsExportSetInputGraphicsImporter);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
- CmpObj_Convert, &grip))
+ CmpInstObj_Convert, &ci,
+ CmpInstObj_Convert, &grip))
return NULL;
_rv = GraphicsExportSetInputGraphicsImporter(ci,
grip);
@@ -13486,13 +13486,13 @@
PyMac_PRECHECK(GraphicsExportGetInputGraphicsImporter);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetInputGraphicsImporter(ci,
&grip);
_res = Py_BuildValue("lO&",
_rv,
- CmpObj_New, grip);
+ CmpInstObj_New, grip);
return _res;
}
@@ -13506,7 +13506,7 @@
PyMac_PRECHECK(GraphicsExportSetInputPicture);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &picture))
return NULL;
_rv = GraphicsExportSetInputPicture(ci,
@@ -13526,7 +13526,7 @@
PyMac_PRECHECK(GraphicsExportGetInputPicture);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetInputPicture(ci,
&picture);
@@ -13546,7 +13546,7 @@
PyMac_PRECHECK(GraphicsExportSetInputGWorld);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
GWorldObj_Convert, &gworld))
return NULL;
_rv = GraphicsExportSetInputGWorld(ci,
@@ -13566,7 +13566,7 @@
PyMac_PRECHECK(GraphicsExportGetInputGWorld);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetInputGWorld(ci,
&gworld);
@@ -13586,7 +13586,7 @@
PyMac_PRECHECK(GraphicsExportSetInputPixmap);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &pixmap))
return NULL;
_rv = GraphicsExportSetInputPixmap(ci,
@@ -13606,7 +13606,7 @@
PyMac_PRECHECK(GraphicsExportGetInputPixmap);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetInputPixmap(ci,
&pixmap);
@@ -13627,7 +13627,7 @@
PyMac_PRECHECK(GraphicsExportSetInputOffsetAndLimit);
#endif
if (!PyArg_ParseTuple(_args, "O&ll",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&offset,
&limit))
return NULL;
@@ -13650,7 +13650,7 @@
PyMac_PRECHECK(GraphicsExportGetInputOffsetAndLimit);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetInputOffsetAndLimit(ci,
&offset,
@@ -13672,7 +13672,7 @@
PyMac_PRECHECK(GraphicsExportMayExporterReadInputData);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportMayExporterReadInputData(ci,
&mayReadInputData);
@@ -13692,7 +13692,7 @@
PyMac_PRECHECK(GraphicsExportGetInputDataSize);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetInputDataSize(ci,
&size);
@@ -13714,7 +13714,7 @@
PyMac_PRECHECK(GraphicsExportReadInputData);
#endif
if (!PyArg_ParseTuple(_args, "O&sll",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&dataPtr,
&dataOffset,
&dataSize))
@@ -13738,7 +13738,7 @@
PyMac_PRECHECK(GraphicsExportGetInputImageDescription);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetInputImageDescription(ci,
&desc);
@@ -13758,7 +13758,7 @@
PyMac_PRECHECK(GraphicsExportGetInputImageDimensions);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetInputImageDimensions(ci,
&dimensions);
@@ -13778,7 +13778,7 @@
PyMac_PRECHECK(GraphicsExportGetInputImageDepth);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetInputImageDepth(ci,
&inputDepth);
@@ -13801,7 +13801,7 @@
PyMac_PRECHECK(GraphicsExportDrawInputImage);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
GrafObj_Convert, &gw,
OptResObj_Convert, &gd,
PyMac_GetRect, &srcRect,
@@ -13828,7 +13828,7 @@
PyMac_PRECHECK(GraphicsExportSetOutputDataReference);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &dataRef,
PyMac_GetOSType, &dataRefType))
return NULL;
@@ -13851,7 +13851,7 @@
PyMac_PRECHECK(GraphicsExportGetOutputDataReference);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetOutputDataReference(ci,
&dataRef,
@@ -13873,7 +13873,7 @@
PyMac_PRECHECK(GraphicsExportSetOutputFile);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetFSSpec, &theFile))
return NULL;
_rv = GraphicsExportSetOutputFile(ci,
@@ -13893,7 +13893,7 @@
PyMac_PRECHECK(GraphicsExportGetOutputFile);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetFSSpec, &theFile))
return NULL;
_rv = GraphicsExportGetOutputFile(ci,
@@ -13913,7 +13913,7 @@
PyMac_PRECHECK(GraphicsExportSetOutputHandle);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &h))
return NULL;
_rv = GraphicsExportSetOutputHandle(ci,
@@ -13933,7 +13933,7 @@
PyMac_PRECHECK(GraphicsExportGetOutputHandle);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetOutputHandle(ci,
&h);
@@ -13955,7 +13955,7 @@
PyMac_PRECHECK(GraphicsExportSetOutputOffsetAndMaxSize);
#endif
if (!PyArg_ParseTuple(_args, "O&llb",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&offset,
&maxSize,
&truncateFile))
@@ -13981,7 +13981,7 @@
PyMac_PRECHECK(GraphicsExportGetOutputOffsetAndMaxSize);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetOutputOffsetAndMaxSize(ci,
&offset,
@@ -14006,7 +14006,7 @@
PyMac_PRECHECK(GraphicsExportSetOutputFileTypeAndCreator);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetOSType, &fileType,
PyMac_GetOSType, &fileCreator))
return NULL;
@@ -14029,7 +14029,7 @@
PyMac_PRECHECK(GraphicsExportGetOutputFileTypeAndCreator);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetOutputFileTypeAndCreator(ci,
&fileType,
@@ -14051,7 +14051,7 @@
PyMac_PRECHECK(GraphicsExportSetOutputMark);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&mark))
return NULL;
_rv = GraphicsExportSetOutputMark(ci,
@@ -14071,7 +14071,7 @@
PyMac_PRECHECK(GraphicsExportGetOutputMark);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetOutputMark(ci,
&mark);
@@ -14093,7 +14093,7 @@
PyMac_PRECHECK(GraphicsExportReadOutputData);
#endif
if (!PyArg_ParseTuple(_args, "O&sll",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&dataPtr,
&dataOffset,
&dataSize))
@@ -14119,7 +14119,7 @@
PyMac_PRECHECK(GraphicsExportSetThumbnailEnabled);
#endif
if (!PyArg_ParseTuple(_args, "O&bll",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&enableThumbnail,
&maxThumbnailWidth,
&maxThumbnailHeight))
@@ -14145,7 +14145,7 @@
PyMac_PRECHECK(GraphicsExportGetThumbnailEnabled);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetThumbnailEnabled(ci,
&thumbnailEnabled,
@@ -14169,7 +14169,7 @@
PyMac_PRECHECK(GraphicsExportSetExifEnabled);
#endif
if (!PyArg_ParseTuple(_args, "O&b",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&enableExif))
return NULL;
_rv = GraphicsExportSetExifEnabled(ci,
@@ -14189,7 +14189,7 @@
PyMac_PRECHECK(GraphicsExportGetExifEnabled);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsExportGetExifEnabled(ci,
&exifEnabled);
@@ -14212,7 +14212,7 @@
PyMac_PRECHECK(ImageTranscoderBeginSequence);
#endif
if (!PyArg_ParseTuple(_args, "O&O&sl",
- CmpObj_Convert, &itc,
+ CmpInstObj_Convert, &itc,
ResObj_Convert, &srcDesc,
&data,
&dataSize))
@@ -14238,7 +14238,7 @@
PyMac_PRECHECK(ImageTranscoderDisposeData);
#endif
if (!PyArg_ParseTuple(_args, "O&s",
- CmpObj_Convert, &itc,
+ CmpInstObj_Convert, &itc,
&dstData))
return NULL;
_rv = ImageTranscoderDisposeData(itc,
@@ -14257,7 +14257,7 @@
PyMac_PRECHECK(ImageTranscoderEndSequence);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &itc))
+ CmpInstObj_Convert, &itc))
return NULL;
_rv = ImageTranscoderEndSequence(itc);
_res = Py_BuildValue("l",
@@ -14854,7 +14854,7 @@
PyMac_PRECHECK(TweenerReset);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &tc))
+ CmpInstObj_Convert, &tc))
return NULL;
_rv = TweenerReset(tc);
_res = Py_BuildValue("l",
@@ -14968,7 +14968,7 @@
PyMac_PRECHECK(MovieImportHandle);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&O&ll",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &dataH,
MovieObj_Convert, &theMovie,
TrackObj_Convert, &targetTrack,
@@ -15009,7 +15009,7 @@
PyMac_PRECHECK(MovieImportFile);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&O&ll",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetFSSpec, &theFile,
MovieObj_Convert, &theMovie,
TrackObj_Convert, &targetTrack,
@@ -15044,7 +15044,7 @@
PyMac_PRECHECK(MovieImportSetSampleDuration);
#endif
if (!PyArg_ParseTuple(_args, "O&ll",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&duration,
&scale))
return NULL;
@@ -15067,7 +15067,7 @@
PyMac_PRECHECK(MovieImportSetSampleDescription);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &desc,
PyMac_GetOSType, &mediaType))
return NULL;
@@ -15089,7 +15089,7 @@
PyMac_PRECHECK(MovieImportSetMediaFile);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &alias))
return NULL;
_rv = MovieImportSetMediaFile(ci,
@@ -15110,7 +15110,7 @@
PyMac_PRECHECK(MovieImportSetDimensions);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetFixed, &width,
PyMac_GetFixed, &height))
return NULL;
@@ -15132,7 +15132,7 @@
PyMac_PRECHECK(MovieImportSetChunkSize);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&chunkSize))
return NULL;
_rv = MovieImportSetChunkSize(ci,
@@ -15153,7 +15153,7 @@
PyMac_PRECHECK(MovieImportSetAuxiliaryData);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &data,
PyMac_GetOSType, &handleType))
return NULL;
@@ -15175,7 +15175,7 @@
PyMac_PRECHECK(MovieImportSetFromScrap);
#endif
if (!PyArg_ParseTuple(_args, "O&b",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&fromScrap))
return NULL;
_rv = MovieImportSetFromScrap(ci,
@@ -15197,7 +15197,7 @@
PyMac_PRECHECK(MovieImportDoUserDialog);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetFSSpec, &theFile,
ResObj_Convert, &theData))
return NULL;
@@ -15221,7 +15221,7 @@
PyMac_PRECHECK(MovieImportSetDuration);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&duration))
return NULL;
_rv = MovieImportSetDuration(ci,
@@ -15241,7 +15241,7 @@
PyMac_PRECHECK(MovieImportGetAuxiliaryDataType);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = MovieImportGetAuxiliaryDataType(ci,
&auxType);
@@ -15263,7 +15263,7 @@
PyMac_PRECHECK(MovieImportValidate);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetFSSpec, &theFile,
ResObj_Convert, &theData))
return NULL;
@@ -15287,7 +15287,7 @@
PyMac_PRECHECK(MovieImportGetFileType);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = MovieImportGetFileType(ci,
&fileType);
@@ -15315,7 +15315,7 @@
PyMac_PRECHECK(MovieImportDataRef);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&O&O&ll",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &dataRef,
PyMac_GetOSType, &dataRefType,
MovieObj_Convert, &theMovie,
@@ -15352,7 +15352,7 @@
PyMac_PRECHECK(MovieImportGetSampleDescription);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = MovieImportGetSampleDescription(ci,
&desc,
@@ -15375,7 +15375,7 @@
PyMac_PRECHECK(MovieImportSetOffsetAndLimit);
#endif
if (!PyArg_ParseTuple(_args, "O&ll",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&offset,
&limit))
return NULL;
@@ -15398,7 +15398,7 @@
PyMac_PRECHECK(MovieImportSetOffsetAndLimit64);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_Getwide, &offset,
PyMac_Getwide, &limit))
return NULL;
@@ -15421,7 +15421,7 @@
PyMac_PRECHECK(MovieImportIdle);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&inFlags))
return NULL;
_rv = MovieImportIdle(ci,
@@ -15445,7 +15445,7 @@
PyMac_PRECHECK(MovieImportValidateDataRef);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &dataRef,
PyMac_GetOSType, &dataRefType))
return NULL;
@@ -15469,7 +15469,7 @@
PyMac_PRECHECK(MovieImportGetLoadState);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = MovieImportGetLoadState(ci,
&importerLoadState);
@@ -15489,7 +15489,7 @@
PyMac_PRECHECK(MovieImportGetMaxLoadedTime);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = MovieImportGetMaxLoadedTime(ci,
&time);
@@ -15509,7 +15509,7 @@
PyMac_PRECHECK(MovieImportEstimateCompletionTime);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = MovieImportEstimateCompletionTime(ci,
&time);
@@ -15529,7 +15529,7 @@
PyMac_PRECHECK(MovieImportSetDontBlock);
#endif
if (!PyArg_ParseTuple(_args, "O&b",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&dontBlock))
return NULL;
_rv = MovieImportSetDontBlock(ci,
@@ -15549,7 +15549,7 @@
PyMac_PRECHECK(MovieImportGetDontBlock);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = MovieImportGetDontBlock(ci,
&willBlock);
@@ -15569,7 +15569,7 @@
PyMac_PRECHECK(MovieImportSetIdleManager);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
IdleManagerObj_Convert, &im))
return NULL;
_rv = MovieImportSetIdleManager(ci,
@@ -15589,7 +15589,7 @@
PyMac_PRECHECK(MovieImportSetNewMovieFlags);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&newMovieFlags))
return NULL;
_rv = MovieImportSetNewMovieFlags(ci,
@@ -15609,7 +15609,7 @@
PyMac_PRECHECK(MovieImportGetDestinationMediaType);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = MovieImportGetDestinationMediaType(ci,
&mediaType);
@@ -15633,7 +15633,7 @@
PyMac_PRECHECK(MovieExportToHandle);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&O&ll",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &dataH,
MovieObj_Convert, &theMovie,
TrackObj_Convert, &onlyThisTrack,
@@ -15665,7 +15665,7 @@
PyMac_PRECHECK(MovieExportToFile);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&O&ll",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetFSSpec, &theFile,
MovieObj_Convert, &theMovie,
TrackObj_Convert, &onlyThisTrack,
@@ -15694,7 +15694,7 @@
PyMac_PRECHECK(MovieExportGetAuxiliaryData);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &dataH))
return NULL;
_rv = MovieExportGetAuxiliaryData(ci,
@@ -15717,7 +15717,7 @@
PyMac_PRECHECK(MovieExportSetSampleDescription);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &desc,
PyMac_GetOSType, &mediaType))
return NULL;
@@ -15743,7 +15743,7 @@
PyMac_PRECHECK(MovieExportDoUserDialog);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&ll",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
MovieObj_Convert, &theMovie,
TrackObj_Convert, &onlyThisTrack,
&startTime,
@@ -15771,7 +15771,7 @@
PyMac_PRECHECK(MovieExportGetCreatorType);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = MovieExportGetCreatorType(ci,
&creator);
@@ -15796,7 +15796,7 @@
PyMac_PRECHECK(MovieExportToDataRef);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&O&O&ll",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &dataRef,
PyMac_GetOSType, &dataRefType,
MovieObj_Convert, &theMovie,
@@ -15827,7 +15827,7 @@
PyMac_PRECHECK(MovieExportFromProceduresToDataRef);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &dataRef,
PyMac_GetOSType, &dataRefType))
return NULL;
@@ -15851,7 +15851,7 @@
PyMac_PRECHECK(MovieExportValidate);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
MovieObj_Convert, &theMovie,
TrackObj_Convert, &onlyThisTrack))
return NULL;
@@ -15875,7 +15875,7 @@
PyMac_PRECHECK(MovieExportGetFileNameExtension);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = MovieExportGetFileNameExtension(ci,
&extension);
@@ -15895,7 +15895,7 @@
PyMac_PRECHECK(MovieExportGetShortFileTypeString);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetStr255, typeString))
return NULL;
_rv = MovieExportGetShortFileTypeString(ci,
@@ -15915,7 +15915,7 @@
PyMac_PRECHECK(MovieExportGetSourceMediaType);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = MovieExportGetSourceMediaType(ci,
&mediaType);
@@ -15935,7 +15935,7 @@
PyMac_PRECHECK(TextExportGetTimeFraction);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = TextExportGetTimeFraction(ci,
&movieTimeFraction);
@@ -15955,7 +15955,7 @@
PyMac_PRECHECK(TextExportSetTimeFraction);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&movieTimeFraction))
return NULL;
_rv = TextExportSetTimeFraction(ci,
@@ -15975,7 +15975,7 @@
PyMac_PRECHECK(TextExportGetSettings);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = TextExportGetSettings(ci,
&setting);
@@ -15995,7 +15995,7 @@
PyMac_PRECHECK(TextExportSetSettings);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&setting))
return NULL;
_rv = TextExportSetSettings(ci,
@@ -16015,7 +16015,7 @@
PyMac_PRECHECK(MIDIImportGetSettings);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = MIDIImportGetSettings(ci,
&setting);
@@ -16035,7 +16035,7 @@
PyMac_PRECHECK(MIDIImportSetSettings);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&setting))
return NULL;
_rv = MIDIImportSetSettings(ci,
@@ -16055,7 +16055,7 @@
PyMac_PRECHECK(GraphicsImageImportSetSequenceEnabled);
#endif
if (!PyArg_ParseTuple(_args, "O&b",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&enable))
return NULL;
_rv = GraphicsImageImportSetSequenceEnabled(ci,
@@ -16075,7 +16075,7 @@
PyMac_PRECHECK(GraphicsImageImportGetSequenceEnabled);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = GraphicsImageImportGetSequenceEnabled(ci,
&enable);
@@ -16097,7 +16097,7 @@
PyMac_PRECHECK(PreviewShowData);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&O&",
- CmpObj_Convert, &p,
+ CmpInstObj_Convert, &p,
PyMac_GetOSType, &dataType,
ResObj_Convert, &data,
PyMac_GetRect, &inHere))
@@ -16123,7 +16123,7 @@
PyMac_PRECHECK(PreviewMakePreviewReference);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &p,
+ CmpInstObj_Convert, &p,
PyMac_GetFSSpec, &sourceFile))
return NULL;
_rv = PreviewMakePreviewReference(p,
@@ -16148,7 +16148,7 @@
PyMac_PRECHECK(PreviewEvent);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &p))
+ CmpInstObj_Convert, &p))
return NULL;
_rv = PreviewEvent(p,
&e,
@@ -16173,7 +16173,7 @@
PyMac_PRECHECK(DataCodecDecompress);
#endif
if (!PyArg_ParseTuple(_args, "O&slsl",
- CmpObj_Convert, &dc,
+ CmpInstObj_Convert, &dc,
&srcData,
&srcSize,
&dstData,
@@ -16200,7 +16200,7 @@
PyMac_PRECHECK(DataCodecGetCompressBufferSize);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &dc,
+ CmpInstObj_Convert, &dc,
&srcSize))
return NULL;
_rv = DataCodecGetCompressBufferSize(dc,
@@ -16227,7 +16227,7 @@
PyMac_PRECHECK(DataCodecCompress);
#endif
if (!PyArg_ParseTuple(_args, "O&slsl",
- CmpObj_Convert, &dc,
+ CmpInstObj_Convert, &dc,
&srcData,
&srcSize,
&dstData,
@@ -16257,7 +16257,7 @@
PyMac_PRECHECK(DataCodecBeginInterruptSafe);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &dc,
+ CmpInstObj_Convert, &dc,
&maxSrcSize))
return NULL;
_rv = DataCodecBeginInterruptSafe(dc,
@@ -16276,7 +16276,7 @@
PyMac_PRECHECK(DataCodecEndInterruptSafe);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &dc))
+ CmpInstObj_Convert, &dc))
return NULL;
_rv = DataCodecEndInterruptSafe(dc);
_res = Py_BuildValue("l",
@@ -17695,7 +17695,7 @@
PyMac_PRECHECK(VDGetMaxSrcRect);
#endif
if (!PyArg_ParseTuple(_args, "O&h",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&inputStd))
return NULL;
_rv = VDGetMaxSrcRect(ci,
@@ -17718,7 +17718,7 @@
PyMac_PRECHECK(VDGetActiveSrcRect);
#endif
if (!PyArg_ParseTuple(_args, "O&h",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&inputStd))
return NULL;
_rv = VDGetActiveSrcRect(ci,
@@ -17740,7 +17740,7 @@
PyMac_PRECHECK(VDSetDigitizerRect);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDSetDigitizerRect(ci,
&digitizerRect);
@@ -17760,7 +17760,7 @@
PyMac_PRECHECK(VDGetDigitizerRect);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetDigitizerRect(ci,
&digitizerRect);
@@ -17781,7 +17781,7 @@
PyMac_PRECHECK(VDGetVBlankRect);
#endif
if (!PyArg_ParseTuple(_args, "O&h",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&inputStd))
return NULL;
_rv = VDGetVBlankRect(ci,
@@ -17803,7 +17803,7 @@
PyMac_PRECHECK(VDGetMaskPixMap);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &maskPixMap))
return NULL;
_rv = VDGetMaskPixMap(ci,
@@ -17823,7 +17823,7 @@
PyMac_PRECHECK(VDUseThisCLUT);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &colorTableHandle))
return NULL;
_rv = VDUseThisCLUT(ci,
@@ -17845,7 +17845,7 @@
PyMac_PRECHECK(VDSetInputGammaValue);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetFixed, &channel1,
PyMac_GetFixed, &channel2,
PyMac_GetFixed, &channel3))
@@ -17871,7 +17871,7 @@
PyMac_PRECHECK(VDGetInputGammaValue);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetInputGammaValue(ci,
&channel1,
@@ -17895,7 +17895,7 @@
PyMac_PRECHECK(VDSetBrightness);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDSetBrightness(ci,
&brightness);
@@ -17915,7 +17915,7 @@
PyMac_PRECHECK(VDGetBrightness);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetBrightness(ci,
&brightness);
@@ -17935,7 +17935,7 @@
PyMac_PRECHECK(VDSetContrast);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDSetContrast(ci,
&contrast);
@@ -17955,7 +17955,7 @@
PyMac_PRECHECK(VDSetHue);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDSetHue(ci,
&hue);
@@ -17975,7 +17975,7 @@
PyMac_PRECHECK(VDSetSharpness);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDSetSharpness(ci,
&sharpness);
@@ -17995,7 +17995,7 @@
PyMac_PRECHECK(VDSetSaturation);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDSetSaturation(ci,
&saturation);
@@ -18015,7 +18015,7 @@
PyMac_PRECHECK(VDGetContrast);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetContrast(ci,
&contrast);
@@ -18035,7 +18035,7 @@
PyMac_PRECHECK(VDGetHue);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetHue(ci,
&hue);
@@ -18055,7 +18055,7 @@
PyMac_PRECHECK(VDGetSharpness);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetSharpness(ci,
&sharpness);
@@ -18075,7 +18075,7 @@
PyMac_PRECHECK(VDGetSaturation);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetSaturation(ci,
&saturation);
@@ -18094,7 +18094,7 @@
PyMac_PRECHECK(VDGrabOneFrame);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGrabOneFrame(ci);
_res = Py_BuildValue("l",
@@ -18113,7 +18113,7 @@
PyMac_PRECHECK(VDGetMaxAuxBuffer);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetMaxAuxBuffer(ci,
&pm,
@@ -18136,7 +18136,7 @@
PyMac_PRECHECK(VDGetCurrentFlags);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetCurrentFlags(ci,
&inputCurrentFlag,
@@ -18158,7 +18158,7 @@
PyMac_PRECHECK(VDSetKeyColor);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&index))
return NULL;
_rv = VDSetKeyColor(ci,
@@ -18178,7 +18178,7 @@
PyMac_PRECHECK(VDGetKeyColor);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetKeyColor(ci,
&index);
@@ -18198,7 +18198,7 @@
PyMac_PRECHECK(VDAddKeyColor);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDAddKeyColor(ci,
&index);
@@ -18218,7 +18218,7 @@
PyMac_PRECHECK(VDGetNextKeyColor);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&index))
return NULL;
_rv = VDGetNextKeyColor(ci,
@@ -18239,7 +18239,7 @@
PyMac_PRECHECK(VDSetKeyColorRange);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDSetKeyColorRange(ci,
&minRGB,
@@ -18262,7 +18262,7 @@
PyMac_PRECHECK(VDGetKeyColorRange);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetKeyColorRange(ci,
&minRGB,
@@ -18284,7 +18284,7 @@
PyMac_PRECHECK(VDSetInputColorSpaceMode);
#endif
if (!PyArg_ParseTuple(_args, "O&h",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&colorSpaceMode))
return NULL;
_rv = VDSetInputColorSpaceMode(ci,
@@ -18304,7 +18304,7 @@
PyMac_PRECHECK(VDGetInputColorSpaceMode);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetInputColorSpaceMode(ci,
&colorSpaceMode);
@@ -18324,7 +18324,7 @@
PyMac_PRECHECK(VDSetClipState);
#endif
if (!PyArg_ParseTuple(_args, "O&h",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&clipEnable))
return NULL;
_rv = VDSetClipState(ci,
@@ -18344,7 +18344,7 @@
PyMac_PRECHECK(VDGetClipState);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetClipState(ci,
&clipEnable);
@@ -18364,7 +18364,7 @@
PyMac_PRECHECK(VDSetClipRgn);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &clipRegion))
return NULL;
_rv = VDSetClipRgn(ci,
@@ -18384,7 +18384,7 @@
PyMac_PRECHECK(VDClearClipRgn);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &clipRegion))
return NULL;
_rv = VDClearClipRgn(ci,
@@ -18404,7 +18404,7 @@
PyMac_PRECHECK(VDGetCLUTInUse);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetCLUTInUse(ci,
&colorTableHandle);
@@ -18424,7 +18424,7 @@
PyMac_PRECHECK(VDSetPLLFilterType);
#endif
if (!PyArg_ParseTuple(_args, "O&h",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&pllType))
return NULL;
_rv = VDSetPLLFilterType(ci,
@@ -18444,7 +18444,7 @@
PyMac_PRECHECK(VDGetPLLFilterType);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetPLLFilterType(ci,
&pllType);
@@ -18466,7 +18466,7 @@
PyMac_PRECHECK(VDGetMaskandValue);
#endif
if (!PyArg_ParseTuple(_args, "O&H",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&blendLevel))
return NULL;
_rv = VDGetMaskandValue(ci,
@@ -18490,7 +18490,7 @@
PyMac_PRECHECK(VDSetMasterBlendLevel);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDSetMasterBlendLevel(ci,
&blendLevel);
@@ -18510,7 +18510,7 @@
PyMac_PRECHECK(VDSetPlayThruOnOff);
#endif
if (!PyArg_ParseTuple(_args, "O&h",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&state))
return NULL;
_rv = VDSetPlayThruOnOff(ci,
@@ -18530,7 +18530,7 @@
PyMac_PRECHECK(VDSetFieldPreference);
#endif
if (!PyArg_ParseTuple(_args, "O&h",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&fieldFlag))
return NULL;
_rv = VDSetFieldPreference(ci,
@@ -18550,7 +18550,7 @@
PyMac_PRECHECK(VDGetFieldPreference);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetFieldPreference(ci,
&fieldFlag);
@@ -18571,7 +18571,7 @@
PyMac_PRECHECK(VDPreflightGlobalRect);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
GrafObj_Convert, &theWindow))
return NULL;
_rv = VDPreflightGlobalRect(ci,
@@ -18594,7 +18594,7 @@
PyMac_PRECHECK(VDSetPlayThruGlobalRect);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
GrafObj_Convert, &theWindow))
return NULL;
_rv = VDSetPlayThruGlobalRect(ci,
@@ -18616,7 +18616,7 @@
PyMac_PRECHECK(VDSetBlackLevelValue);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDSetBlackLevelValue(ci,
&blackLevel);
@@ -18636,7 +18636,7 @@
PyMac_PRECHECK(VDGetBlackLevelValue);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetBlackLevelValue(ci,
&blackLevel);
@@ -18656,7 +18656,7 @@
PyMac_PRECHECK(VDSetWhiteLevelValue);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDSetWhiteLevelValue(ci,
&whiteLevel);
@@ -18676,7 +18676,7 @@
PyMac_PRECHECK(VDGetWhiteLevelValue);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetWhiteLevelValue(ci,
&whiteLevel);
@@ -18702,7 +18702,7 @@
PyMac_PRECHECK(VDGetVideoDefaults);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetVideoDefaults(ci,
&blackLevel,
@@ -18734,7 +18734,7 @@
PyMac_PRECHECK(VDGetNumberOfInputs);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetNumberOfInputs(ci,
&inputs);
@@ -18755,7 +18755,7 @@
PyMac_PRECHECK(VDGetInputFormat);
#endif
if (!PyArg_ParseTuple(_args, "O&h",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&input))
return NULL;
_rv = VDGetInputFormat(ci,
@@ -18777,7 +18777,7 @@
PyMac_PRECHECK(VDSetInput);
#endif
if (!PyArg_ParseTuple(_args, "O&h",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&input))
return NULL;
_rv = VDSetInput(ci,
@@ -18797,7 +18797,7 @@
PyMac_PRECHECK(VDGetInput);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetInput(ci,
&input);
@@ -18817,7 +18817,7 @@
PyMac_PRECHECK(VDSetInputStandard);
#endif
if (!PyArg_ParseTuple(_args, "O&h",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&inputStandard))
return NULL;
_rv = VDSetInputStandard(ci,
@@ -18837,7 +18837,7 @@
PyMac_PRECHECK(VDSetupBuffers);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &bufferList))
return NULL;
_rv = VDSetupBuffers(ci,
@@ -18857,7 +18857,7 @@
PyMac_PRECHECK(VDGrabOneFrameAsync);
#endif
if (!PyArg_ParseTuple(_args, "O&h",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&buffer))
return NULL;
_rv = VDGrabOneFrameAsync(ci,
@@ -18877,7 +18877,7 @@
PyMac_PRECHECK(VDDone);
#endif
if (!PyArg_ParseTuple(_args, "O&h",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&buffer))
return NULL;
_rv = VDDone(ci,
@@ -18902,7 +18902,7 @@
PyMac_PRECHECK(VDSetCompression);
#endif
if (!PyArg_ParseTuple(_args, "O&O&hlll",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetOSType, &compressType,
&depth,
&spatialQuality,
@@ -18931,7 +18931,7 @@
PyMac_PRECHECK(VDCompressOneFrameAsync);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDCompressOneFrameAsync(ci);
_res = Py_BuildValue("l",
@@ -18949,7 +18949,7 @@
PyMac_PRECHECK(VDGetImageDescription);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &desc))
return NULL;
_rv = VDGetImageDescription(ci,
@@ -18968,7 +18968,7 @@
PyMac_PRECHECK(VDResetCompressSequence);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDResetCompressSequence(ci);
_res = Py_BuildValue("l",
@@ -18986,7 +18986,7 @@
PyMac_PRECHECK(VDSetCompressionOnOff);
#endif
if (!PyArg_ParseTuple(_args, "O&b",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&state))
return NULL;
_rv = VDSetCompressionOnOff(ci,
@@ -19006,7 +19006,7 @@
PyMac_PRECHECK(VDGetCompressionTypes);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
ResObj_Convert, &h))
return NULL;
_rv = VDGetCompressionTypes(ci,
@@ -19026,7 +19026,7 @@
PyMac_PRECHECK(VDSetTimeBase);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
TimeBaseObj_Convert, &t))
return NULL;
_rv = VDSetTimeBase(ci,
@@ -19046,7 +19046,7 @@
PyMac_PRECHECK(VDSetFrameRate);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetFixed, &framesPerSecond))
return NULL;
_rv = VDSetFrameRate(ci,
@@ -19068,7 +19068,7 @@
PyMac_PRECHECK(VDGetDataRate);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetDataRate(ci,
&milliSecPerFrame,
@@ -19092,7 +19092,7 @@
PyMac_PRECHECK(VDGetSoundInputDriver);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetStr255, soundDriverName))
return NULL;
_rv = VDGetSoundInputDriver(ci,
@@ -19113,7 +19113,7 @@
PyMac_PRECHECK(VDGetDMADepths);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetDMADepths(ci,
&depthArray,
@@ -19135,7 +19135,7 @@
PyMac_PRECHECK(VDGetPreferredTimeScale);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetPreferredTimeScale(ci,
&preferred);
@@ -19154,7 +19154,7 @@
PyMac_PRECHECK(VDReleaseAsyncBuffers);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDReleaseAsyncBuffers(ci);
_res = Py_BuildValue("l",
@@ -19172,7 +19172,7 @@
PyMac_PRECHECK(VDSetDataRate);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&bytesPerSecond))
return NULL;
_rv = VDSetDataRate(ci,
@@ -19194,7 +19194,7 @@
PyMac_PRECHECK(VDGetTimeCode);
#endif
if (!PyArg_ParseTuple(_args, "O&ss",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&timeCodeFormat,
&timeCodeTime))
return NULL;
@@ -19218,7 +19218,7 @@
PyMac_PRECHECK(VDUseSafeBuffers);
#endif
if (!PyArg_ParseTuple(_args, "O&b",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&useSafeBuffers))
return NULL;
_rv = VDUseSafeBuffers(ci,
@@ -19239,7 +19239,7 @@
PyMac_PRECHECK(VDGetSoundInputSource);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&videoInput))
return NULL;
_rv = VDGetSoundInputSource(ci,
@@ -19266,7 +19266,7 @@
PyMac_PRECHECK(VDGetCompressionTime);
#endif
if (!PyArg_ParseTuple(_args, "O&O&h",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetOSType, &compressionType,
&depth))
return NULL;
@@ -19296,7 +19296,7 @@
PyMac_PRECHECK(VDSetPreferredPacketSize);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&preferredPacketSizeInBytes))
return NULL;
_rv = VDSetPreferredPacketSize(ci,
@@ -19317,7 +19317,7 @@
PyMac_PRECHECK(VDSetPreferredImageDimensions);
#endif
if (!PyArg_ParseTuple(_args, "O&ll",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&width,
&height))
return NULL;
@@ -19340,7 +19340,7 @@
PyMac_PRECHECK(VDGetPreferredImageDimensions);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &ci))
+ CmpInstObj_Convert, &ci))
return NULL;
_rv = VDGetPreferredImageDimensions(ci,
&width,
@@ -19363,7 +19363,7 @@
PyMac_PRECHECK(VDGetInputName);
#endif
if (!PyArg_ParseTuple(_args, "O&lO&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&videoInput,
PyMac_GetStr255, name))
return NULL;
@@ -19385,7 +19385,7 @@
PyMac_PRECHECK(VDSetDestinationPort);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
GrafObj_Convert, &destPort))
return NULL;
_rv = VDSetDestinationPort(ci,
@@ -19406,7 +19406,7 @@
PyMac_PRECHECK(VDGetDeviceNameAndFlags);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
PyMac_GetStr255, outName))
return NULL;
_rv = VDGetDeviceNameAndFlags(ci,
@@ -19428,7 +19428,7 @@
PyMac_PRECHECK(VDCaptureStateChanging);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &ci,
+ CmpInstObj_Convert, &ci,
&inStateFlags))
return NULL;
_rv = VDCaptureStateChanging(ci,
@@ -19687,7 +19687,7 @@
PyMac_PRECHECK(SGInitialize);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &s))
+ CmpInstObj_Convert, &s))
return NULL;
_rv = SGInitialize(s);
_res = Py_BuildValue("l",
@@ -19706,7 +19706,7 @@
PyMac_PRECHECK(SGSetDataOutput);
#endif
if (!PyArg_ParseTuple(_args, "O&O&l",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
PyMac_GetFSSpec, &movieFile,
&whereFlags))
return NULL;
@@ -19729,7 +19729,7 @@
PyMac_PRECHECK(SGGetDataOutput);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
PyMac_GetFSSpec, &movieFile))
return NULL;
_rv = SGGetDataOutput(s,
@@ -19752,7 +19752,7 @@
PyMac_PRECHECK(SGSetGWorld);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
GrafObj_Convert, &gp,
OptResObj_Convert, &gd))
return NULL;
@@ -19775,7 +19775,7 @@
PyMac_PRECHECK(SGGetGWorld);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &s))
+ CmpInstObj_Convert, &s))
return NULL;
_rv = SGGetGWorld(s,
&gp,
@@ -19798,7 +19798,7 @@
PyMac_PRECHECK(SGNewChannel);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
PyMac_GetOSType, &channelType))
return NULL;
_rv = SGNewChannel(s,
@@ -19820,7 +19820,7 @@
PyMac_PRECHECK(SGDisposeChannel);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
CmpInstObj_Convert, &c))
return NULL;
_rv = SGDisposeChannel(s,
@@ -19839,7 +19839,7 @@
PyMac_PRECHECK(SGStartPreview);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &s))
+ CmpInstObj_Convert, &s))
return NULL;
_rv = SGStartPreview(s);
_res = Py_BuildValue("l",
@@ -19856,7 +19856,7 @@
PyMac_PRECHECK(SGStartRecord);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &s))
+ CmpInstObj_Convert, &s))
return NULL;
_rv = SGStartRecord(s);
_res = Py_BuildValue("l",
@@ -19873,7 +19873,7 @@
PyMac_PRECHECK(SGIdle);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &s))
+ CmpInstObj_Convert, &s))
return NULL;
_rv = SGIdle(s);
_res = Py_BuildValue("l",
@@ -19890,7 +19890,7 @@
PyMac_PRECHECK(SGStop);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &s))
+ CmpInstObj_Convert, &s))
return NULL;
_rv = SGStop(s);
_res = Py_BuildValue("l",
@@ -19908,7 +19908,7 @@
PyMac_PRECHECK(SGPause);
#endif
if (!PyArg_ParseTuple(_args, "O&b",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
&pause))
return NULL;
_rv = SGPause(s,
@@ -19929,7 +19929,7 @@
PyMac_PRECHECK(SGPrepare);
#endif
if (!PyArg_ParseTuple(_args, "O&bb",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
&prepareForPreview,
&prepareForRecord))
return NULL;
@@ -19950,7 +19950,7 @@
PyMac_PRECHECK(SGRelease);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &s))
+ CmpInstObj_Convert, &s))
return NULL;
_rv = SGRelease(s);
_res = Py_BuildValue("l",
@@ -19967,7 +19967,7 @@
PyMac_PRECHECK(SGGetMovie);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &s))
+ CmpInstObj_Convert, &s))
return NULL;
_rv = SGGetMovie(s);
_res = Py_BuildValue("O&",
@@ -19985,7 +19985,7 @@
PyMac_PRECHECK(SGSetMaximumRecordTime);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
&ticks))
return NULL;
_rv = SGSetMaximumRecordTime(s,
@@ -20005,7 +20005,7 @@
PyMac_PRECHECK(SGGetMaximumRecordTime);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &s))
+ CmpInstObj_Convert, &s))
return NULL;
_rv = SGGetMaximumRecordTime(s,
&ticks);
@@ -20025,7 +20025,7 @@
PyMac_PRECHECK(SGGetStorageSpaceRemaining);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &s))
+ CmpInstObj_Convert, &s))
return NULL;
_rv = SGGetStorageSpaceRemaining(s,
&bytes);
@@ -20045,7 +20045,7 @@
PyMac_PRECHECK(SGGetTimeRemaining);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &s))
+ CmpInstObj_Convert, &s))
return NULL;
_rv = SGGetTimeRemaining(s,
&ticksLeft);
@@ -20068,7 +20068,7 @@
PyMac_PRECHECK(SGGrabPict);
#endif
if (!PyArg_ParseTuple(_args, "O&O&hl",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
PyMac_GetRect, &bounds,
&offscreenDepth,
&grabPictFlags))
@@ -20094,7 +20094,7 @@
PyMac_PRECHECK(SGGetLastMovieResID);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &s))
+ CmpInstObj_Convert, &s))
return NULL;
_rv = SGGetLastMovieResID(s,
&resID);
@@ -20114,7 +20114,7 @@
PyMac_PRECHECK(SGSetFlags);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
&sgFlags))
return NULL;
_rv = SGSetFlags(s,
@@ -20134,7 +20134,7 @@
PyMac_PRECHECK(SGGetFlags);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &s))
+ CmpInstObj_Convert, &s))
return NULL;
_rv = SGGetFlags(s,
&sgFlags);
@@ -20155,7 +20155,7 @@
PyMac_PRECHECK(SGNewChannelFromComponent);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
CmpObj_Convert, &sgChannelComponent))
return NULL;
_rv = SGNewChannelFromComponent(s,
@@ -20178,7 +20178,7 @@
PyMac_PRECHECK(SGSetSettings);
#endif
if (!PyArg_ParseTuple(_args, "O&O&l",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
UserDataObj_Convert, &ud,
&flags))
return NULL;
@@ -20201,7 +20201,7 @@
PyMac_PRECHECK(SGGetSettings);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
&flags))
return NULL;
_rv = SGGetSettings(s,
@@ -20225,7 +20225,7 @@
PyMac_PRECHECK(SGGetIndChannel);
#endif
if (!PyArg_ParseTuple(_args, "O&h",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
&index))
return NULL;
_rv = SGGetIndChannel(s,
@@ -20249,7 +20249,7 @@
PyMac_PRECHECK(SGUpdate);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
ResObj_Convert, &updateRgn))
return NULL;
_rv = SGUpdate(s,
@@ -20269,7 +20269,7 @@
PyMac_PRECHECK(SGGetPause);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &s))
+ CmpInstObj_Convert, &s))
return NULL;
_rv = SGGetPause(s,
&paused);
@@ -20291,7 +20291,7 @@
PyMac_PRECHECK(SGSetChannelSettings);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&l",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
CmpInstObj_Convert, &c,
UserDataObj_Convert, &ud,
&flags))
@@ -20317,7 +20317,7 @@
PyMac_PRECHECK(SGGetChannelSettings);
#endif
if (!PyArg_ParseTuple(_args, "O&O&l",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
CmpInstObj_Convert, &c,
&flags))
return NULL;
@@ -20342,7 +20342,7 @@
PyMac_PRECHECK(SGGetMode);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &s))
+ CmpInstObj_Convert, &s))
return NULL;
_rv = SGGetMode(s,
&previewMode,
@@ -20366,7 +20366,7 @@
PyMac_PRECHECK(SGSetDataRef);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&l",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
ResObj_Convert, &dataRef,
PyMac_GetOSType, &dataRefType,
&whereFlags))
@@ -20392,7 +20392,7 @@
PyMac_PRECHECK(SGGetDataRef);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &s))
+ CmpInstObj_Convert, &s))
return NULL;
_rv = SGGetDataRef(s,
&dataRef,
@@ -20419,7 +20419,7 @@
PyMac_PRECHECK(SGNewOutput);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&l",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
ResObj_Convert, &dataRef,
PyMac_GetOSType, &dataRefType,
&whereFlags))
@@ -20445,7 +20445,7 @@
PyMac_PRECHECK(SGDisposeOutput);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
SGOutputObj_Convert, &sgOut))
return NULL;
_rv = SGDisposeOutput(s,
@@ -20466,7 +20466,7 @@
PyMac_PRECHECK(SGSetOutputFlags);
#endif
if (!PyArg_ParseTuple(_args, "O&O&l",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
SGOutputObj_Convert, &sgOut,
&whereFlags))
return NULL;
@@ -20489,7 +20489,7 @@
PyMac_PRECHECK(SGSetChannelOutput);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
CmpInstObj_Convert, &c,
SGOutputObj_Convert, &sgOut))
return NULL;
@@ -20512,7 +20512,7 @@
PyMac_PRECHECK(SGGetDataOutputStorageSpaceRemaining);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
SGOutputObj_Convert, &sgOut))
return NULL;
_rv = SGGetDataOutputStorageSpaceRemaining(s,
@@ -20535,7 +20535,7 @@
PyMac_PRECHECK(SGHandleUpdateEvent);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
PyMac_GetEventRecord, &event))
return NULL;
_rv = SGHandleUpdateEvent(s,
@@ -20558,7 +20558,7 @@
PyMac_PRECHECK(SGSetOutputNextOutput);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
SGOutputObj_Convert, &sgOut,
SGOutputObj_Convert, &nextOut))
return NULL;
@@ -20581,7 +20581,7 @@
PyMac_PRECHECK(SGGetOutputNextOutput);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
SGOutputObj_Convert, &sgOut))
return NULL;
_rv = SGGetOutputNextOutput(s,
@@ -20604,7 +20604,7 @@
PyMac_PRECHECK(SGSetOutputMaximumOffset);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
SGOutputObj_Convert, &sgOut,
PyMac_Getwide, &maxOffset))
return NULL;
@@ -20627,7 +20627,7 @@
PyMac_PRECHECK(SGGetOutputMaximumOffset);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
SGOutputObj_Convert, &sgOut))
return NULL;
_rv = SGGetOutputMaximumOffset(s,
@@ -20651,7 +20651,7 @@
PyMac_PRECHECK(SGGetOutputDataReference);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
SGOutputObj_Convert, &sgOut))
return NULL;
_rv = SGGetOutputDataReference(s,
@@ -20679,7 +20679,7 @@
PyMac_PRECHECK(SGWriteExtendedMovieData);
#endif
if (!PyArg_ParseTuple(_args, "O&O&sl",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
CmpInstObj_Convert, &c,
&p,
&len))
@@ -20707,7 +20707,7 @@
PyMac_PRECHECK(SGGetStorageSpaceRemaining64);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &s))
+ CmpInstObj_Convert, &s))
return NULL;
_rv = SGGetStorageSpaceRemaining64(s,
&bytes);
@@ -20728,7 +20728,7 @@
PyMac_PRECHECK(SGGetDataOutputStorageSpaceRemaining64);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
SGOutputObj_Convert, &sgOut))
return NULL;
_rv = SGGetDataOutputStorageSpaceRemaining64(s,
@@ -20753,7 +20753,7 @@
PyMac_PRECHECK(SGWriteMovieData);
#endif
if (!PyArg_ParseTuple(_args, "O&O&sl",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
CmpInstObj_Convert, &c,
&p,
&len))
@@ -20779,7 +20779,7 @@
PyMac_PRECHECK(SGGetTimeBase);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &s))
+ CmpInstObj_Convert, &s))
return NULL;
_rv = SGGetTimeBase(s,
&tb);
@@ -20805,7 +20805,7 @@
PyMac_PRECHECK(SGAddMovieData);
#endif
if (!PyArg_ParseTuple(_args, "O&O&slllh",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
CmpInstObj_Convert, &c,
&p,
&len,
@@ -20837,7 +20837,7 @@
PyMac_PRECHECK(SGChangedSource);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
CmpInstObj_Convert, &c))
return NULL;
_rv = SGChangedSource(s,
@@ -20864,7 +20864,7 @@
PyMac_PRECHECK(SGAddExtendedMovieData);
#endif
if (!PyArg_ParseTuple(_args, "O&O&slllh",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
CmpInstObj_Convert, &c,
&p,
&len,
@@ -20900,7 +20900,7 @@
PyMac_PRECHECK(SGAddOutputDataRefToMedia);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&O&",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
SGOutputObj_Convert, &sgOut,
MediaObj_Convert, &theMedia,
ResObj_Convert, &desc))
@@ -20924,7 +20924,7 @@
PyMac_PRECHECK(SGSetSettingsSummary);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
ResObj_Convert, &summaryText))
return NULL;
_rv = SGSetSettingsSummary(s,
@@ -21534,7 +21534,7 @@
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
CmpInstObj_Convert, &c,
- CmpObj_Convert, &owner))
+ CmpInstObj_Convert, &owner))
return NULL;
_rv = SGInitChannel(c,
owner);
@@ -21616,7 +21616,7 @@
PyMac_PRECHECK(SGPanelGetDitl);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &s))
+ CmpInstObj_Convert, &s))
return NULL;
_rv = SGPanelGetDitl(s,
&ditl);
@@ -21636,7 +21636,7 @@
PyMac_PRECHECK(SGPanelGetTitle);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
PyMac_GetStr255, title))
return NULL;
_rv = SGPanelGetTitle(s,
@@ -21656,7 +21656,7 @@
PyMac_PRECHECK(SGPanelCanRun);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
CmpInstObj_Convert, &c))
return NULL;
_rv = SGPanelCanRun(s,
@@ -21678,7 +21678,7 @@
PyMac_PRECHECK(SGPanelInstall);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&h",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
CmpInstObj_Convert, &c,
DlgObj_Convert, &d,
&itemOffset))
@@ -21707,7 +21707,7 @@
PyMac_PRECHECK(SGPanelEvent);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&hO&",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
CmpInstObj_Convert, &c,
DlgObj_Convert, &d,
&itemOffset,
@@ -21740,7 +21740,7 @@
PyMac_PRECHECK(SGPanelItem);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&hh",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
CmpInstObj_Convert, &c,
DlgObj_Convert, &d,
&itemOffset,
@@ -21768,7 +21768,7 @@
PyMac_PRECHECK(SGPanelRemove);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&h",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
CmpInstObj_Convert, &c,
DlgObj_Convert, &d,
&itemOffset))
@@ -21792,8 +21792,8 @@
PyMac_PRECHECK(SGPanelSetGrabber);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &s,
- CmpObj_Convert, &sg))
+ CmpInstObj_Convert, &s,
+ CmpInstObj_Convert, &sg))
return NULL;
_rv = SGPanelSetGrabber(s,
sg);
@@ -21812,7 +21812,7 @@
PyMac_PRECHECK(SGPanelSetResFile);
#endif
if (!PyArg_ParseTuple(_args, "O&h",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
&resRef))
return NULL;
_rv = SGPanelSetResFile(s,
@@ -21834,7 +21834,7 @@
PyMac_PRECHECK(SGPanelGetSettings);
#endif
if (!PyArg_ParseTuple(_args, "O&O&l",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
CmpInstObj_Convert, &c,
&flags))
return NULL;
@@ -21860,7 +21860,7 @@
PyMac_PRECHECK(SGPanelSetSettings);
#endif
if (!PyArg_ParseTuple(_args, "O&O&O&l",
- CmpObj_Convert, &s,
+ CmpInstObj_Convert, &s,
CmpInstObj_Convert, &c,
UserDataObj_Convert, &ud,
&flags))
@@ -21884,7 +21884,7 @@
PyMac_PRECHECK(SGPanelValidateInput);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &s))
+ CmpInstObj_Convert, &s))
return NULL;
_rv = SGPanelValidateInput(s,
&ok);
@@ -21905,7 +21905,7 @@
PyMac_PRECHECK(SGPanelGetDITLForSize);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &s))
+ CmpInstObj_Convert, &s))
return NULL;
_rv = SGPanelGetDITLForSize(s,
&ditl,
@@ -22806,7 +22806,7 @@
PyMac_PRECHECK(QTVideoOutputGetCurrentClientName);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &vo,
+ CmpInstObj_Convert, &vo,
PyMac_GetStr255, str))
return NULL;
_rv = QTVideoOutputGetCurrentClientName(vo,
@@ -22826,7 +22826,7 @@
PyMac_PRECHECK(QTVideoOutputSetClientName);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &vo,
+ CmpInstObj_Convert, &vo,
PyMac_GetStr255, str))
return NULL;
_rv = QTVideoOutputSetClientName(vo,
@@ -22846,7 +22846,7 @@
PyMac_PRECHECK(QTVideoOutputGetClientName);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &vo,
+ CmpInstObj_Convert, &vo,
PyMac_GetStr255, str))
return NULL;
_rv = QTVideoOutputGetClientName(vo,
@@ -22865,7 +22865,7 @@
PyMac_PRECHECK(QTVideoOutputBegin);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &vo))
+ CmpInstObj_Convert, &vo))
return NULL;
_rv = QTVideoOutputBegin(vo);
_res = Py_BuildValue("l",
@@ -22882,7 +22882,7 @@
PyMac_PRECHECK(QTVideoOutputEnd);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &vo))
+ CmpInstObj_Convert, &vo))
return NULL;
_rv = QTVideoOutputEnd(vo);
_res = Py_BuildValue("l",
@@ -22900,7 +22900,7 @@
PyMac_PRECHECK(QTVideoOutputSetDisplayMode);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &vo,
+ CmpInstObj_Convert, &vo,
&displayModeID))
return NULL;
_rv = QTVideoOutputSetDisplayMode(vo,
@@ -22920,7 +22920,7 @@
PyMac_PRECHECK(QTVideoOutputGetDisplayMode);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &vo))
+ CmpInstObj_Convert, &vo))
return NULL;
_rv = QTVideoOutputGetDisplayMode(vo,
&displayModeID);
@@ -22940,7 +22940,7 @@
PyMac_PRECHECK(QTVideoOutputGetGWorld);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &vo))
+ CmpInstObj_Convert, &vo))
return NULL;
_rv = QTVideoOutputGetGWorld(vo,
&gw);
@@ -22961,7 +22961,7 @@
PyMac_PRECHECK(QTVideoOutputGetIndSoundOutput);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &vo,
+ CmpInstObj_Convert, &vo,
&index))
return NULL;
_rv = QTVideoOutputGetIndSoundOutput(vo,
@@ -22983,7 +22983,7 @@
PyMac_PRECHECK(QTVideoOutputGetClock);
#endif
if (!PyArg_ParseTuple(_args, "O&",
- CmpObj_Convert, &vo))
+ CmpInstObj_Convert, &vo))
return NULL;
_rv = QTVideoOutputGetClock(vo,
&clock);
@@ -23003,7 +23003,7 @@
PyMac_PRECHECK(QTVideoOutputSetEchoPort);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &vo,
+ CmpInstObj_Convert, &vo,
GrafObj_Convert, &echoPort))
return NULL;
_rv = QTVideoOutputSetEchoPort(vo,
@@ -23024,7 +23024,7 @@
PyMac_PRECHECK(QTVideoOutputGetIndImageDecompressor);
#endif
if (!PyArg_ParseTuple(_args, "O&l",
- CmpObj_Convert, &vo,
+ CmpInstObj_Convert, &vo,
&index))
return NULL;
_rv = QTVideoOutputGetIndImageDecompressor(vo,
@@ -23046,7 +23046,7 @@
PyMac_PRECHECK(QTVideoOutputBaseSetEchoPort);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
- CmpObj_Convert, &vo,
+ CmpInstObj_Convert, &vo,
GrafObj_Convert, &echoPort))
return NULL;
_rv = QTVideoOutputBaseSetEchoPort(vo,
Modified: python/branches/release26-maint/Mac/Modules/qt/qtsupport.py
==============================================================================
--- python/branches/release26-maint/Mac/Modules/qt/qtsupport.py (original)
+++ python/branches/release26-maint/Mac/Modules/qt/qtsupport.py Mon Mar 30 17:24:08 2009
@@ -135,19 +135,22 @@
CompressorComponent = OpaqueByValueType('CompressorComponent', 'CmpObj')
DecompressorComponent = OpaqueByValueType('DecompressorComponent', 'CmpObj')
CodecComponent = OpaqueByValueType('CodecComponent', 'CmpObj')
-GraphicsImportComponent = OpaqueByValueType('GraphicsImportComponent', 'CmpObj')
-GraphicsExportComponent = OpaqueByValueType('GraphicsExportComponent', 'CmpObj')
-ImageTranscoderComponent = OpaqueByValueType('ImageTranscoderComponent', 'CmpObj')
-DataCodecComponent = OpaqueByValueType('DataCodecComponent', 'CmpObj')
-GraphicImageMovieImportComponent = OpaqueByValueType('GraphicImageMovieImportComponent', 'CmpObj')
-MovieExportComponent = OpaqueByValueType('MovieExportComponent', 'CmpObj')
-MovieImportComponent = OpaqueByValueType('MovieImportComponent', 'CmpObj')
-QTVideoOutputComponent = OpaqueByValueType('QTVideoOutputComponent', 'CmpObj')
-SeqGrabComponent = OpaqueByValueType('SeqGrabComponent', 'CmpObj')
-TextExportComponent = OpaqueByValueType('TextExportComponent', 'CmpObj')
-TweenerComponent = OpaqueByValueType('TweenerComponent', 'CmpObj')
-pnotComponent = OpaqueByValueType('pnotComponent', 'CmpObj')
-VideoDigitizerComponent = OpaqueByValueType('VideoDigitizerComponent', 'CmpObj')
+
+# Despite their names, these are all ComponentInstance types
+GraphicsImportComponent = OpaqueByValueType('GraphicsImportComponent', 'CmpInstObj')
+GraphicsExportComponent = OpaqueByValueType('GraphicsExportComponent', 'CmpInstObj')
+ImageTranscoderComponent = OpaqueByValueType('ImageTranscoderComponent', 'CmpInstObj')
+MovieImportComponent = OpaqueByValueType('MovieImportComponent', 'CmpInstObj')
+MovieExportComponent = OpaqueByValueType('MovieExportComponent', 'CmpInstObj')
+TextExportComponent = OpaqueByValueType('TextExportComponent', 'CmpInstObj')
+GraphicImageMovieImportComponent = OpaqueByValueType('GraphicImageMovieImportComponent', 'CmpInstObj')
+pnotComponent = OpaqueByValueType('pnotComponent', 'CmpInstObj')
+# DataCompressorComponent, DataDecompressorComponent would go here
+DataCodecComponent = OpaqueByValueType('DataCodecComponent', 'CmpInstObj')
+TweenerComponent = OpaqueByValueType('TweenerComponent', 'CmpInstObj')
+QTVideoOutputComponent = OpaqueByValueType('QTVideoOutputComponent', 'CmpInstObj')
+SeqGrabComponent = OpaqueByValueType('SeqGrabComponent', 'CmpInstObj')
+VideoDigitizerComponent = OpaqueByValueType('VideoDigitizerComponent', 'CmpInstObj')
ComponentInstance = OpaqueByValueType('ComponentInstance', 'CmpInstObj')
MediaHandler = OpaqueByValueType('MediaHandler', 'CmpInstObj')
More information about the Python-checkins
mailing list