Finished update to universal header 3.4.2.
diff --git a/Lib/plat-mac/Carbon/QuickTime.py b/Lib/plat-mac/Carbon/QuickTime.py
index a6284ec..399b9ab 100644
--- a/Lib/plat-mac/Carbon/QuickTime.py
+++ b/Lib/plat-mac/Carbon/QuickTime.py
@@ -25,6 +25,7 @@
MovieMediaType = FOUR_CHAR_CODE('moov')
TweenMediaType = FOUR_CHAR_CODE('twen')
ThreeDeeMediaType = FOUR_CHAR_CODE('qd3d')
+SkinMediaType = FOUR_CHAR_CODE('skin')
HandleDataHandlerSubType = FOUR_CHAR_CODE('hndl')
PointerDataHandlerSubType = FOUR_CHAR_CODE('ptr ')
NullDataHandlerSubType = FOUR_CHAR_CODE('null')
@@ -38,6 +39,8 @@
kCharacteristicNonLinear = FOUR_CHAR_CODE('nonl')
kCharacteristicCanStep = FOUR_CHAR_CODE('step')
kCharacteristicHasNoDuration = FOUR_CHAR_CODE('noti')
+kCharacteristicHasSkinData = FOUR_CHAR_CODE('skin')
+kCharacteristicProvidesKeyFocus = FOUR_CHAR_CODE('keyf')
kUserDataMovieControllerType = FOUR_CHAR_CODE('ctyp')
kUserDataName = FOUR_CHAR_CODE('name')
kUserDataTextAlbum = FOUR_CHAR_CODE('\xa9alb')
@@ -161,6 +164,12 @@
kActionMovieSetLanguage = 1036
kActionMovieChanged = 1037
kActionMovieRestartAtTime = 1038
+kActionMovieGotoNextChapter = 1039
+kActionMovieGotoPreviousChapter = 1040
+kActionMovieGotoFirstChapter = 1041
+kActionMovieGotoLastChapter = 1042
+kActionMovieGotoChapterByIndex = 1043
+kActionMovieSetScale = 1044
kActionTrackSetVolume = 2048
kActionTrackSetBalance = 2049
kActionTrackSetEnabled = 2050
@@ -182,6 +191,7 @@
kActionSpriteScale = 3081
kActionSpriteRotate = 3082
kActionSpriteStretch = 3083
+kActionSpriteSetCanBeHitTested = 3094
kActionQTVRSetPanAngle = 4096
kActionQTVRSetTiltAngle = 4097
kActionQTVRSetFieldOfView = 4098
@@ -190,6 +200,7 @@
kActionQTVREnableHotSpot = 4101
kActionQTVRShowHotSpots = 4102
kActionQTVRTranslateObject = 4103
+kActionQTVRSetViewState = 4109
kActionMusicPlayNote = 5120
kActionMusicSetController = 5121
kActionCase = 6144
@@ -212,6 +223,7 @@
kActionLoadComponent = 6161
kActionSetFocus = 6162
kActionDontPassKeyEvent = 6163
+kActionSetRandomSeed = 6164
kActionSpriteTrackSetVariable = 7168
kActionSpriteTrackNewSprite = 7169
kActionSpriteTrackDisposeSprite = 7170
@@ -219,6 +231,9 @@
kActionSpriteTrackConcatVariables = 7172
kActionSpriteTrackSetVariableToMovieURL = 7173
kActionSpriteTrackSetVariableToMovieBaseURL = 7174
+kActionSpriteTrackSetAllSpritesHitTestingMode = 7181
+kActionSpriteTrackNewImage = 7182
+kActionSpriteTrackDisposeImage = 7183
kActionApplicationNumberAndString = 8192
kActionQD3DNamedObjectTranslateTo = 9216
kActionQD3DNamedObjectScaleTo = 9217
@@ -306,6 +321,14 @@
kOperandMovieIsActive = 1035
kOperandMovieName = 1036
kOperandMovieID = 1037
+kOperandMovieChapterCount = 1038
+kOperandMovieChapterIndex = 1039
+kOperandMovieChapterName = 1040
+kOperandMovieChapterNameByIndex = 1041
+kOperandMovieChapterIndexByName = 1042
+kOperandMovieAnnotation = 1043
+kOperandMovieConnectionFlags = 1044
+kOperandMovieConnectionString = 1045
kOperandTrackVolume = 2048
kOperandTrackBalance = 2049
kOperandTrackEnabled = 2050
@@ -342,6 +365,10 @@
kOperandSpriteImageRegistrationPointY = 3093
kOperandSpriteTrackSpriteIDAtPoint = 3094
kOperandSpriteName = 3095
+kOperandSpriteCanBeHitTested = 3105
+kOperandSpriteTrackAllSpritesHitTestingMode = 3106
+kOperandSpriteTrackImageIDByIndex = 3107
+kOperandSpriteTrackImageIndexByID = 3108
kOperandQTVRPanAngle = 4096
kOperandQTVRTiltAngle = 4097
kOperandQTVRFieldOfView = 4098
@@ -349,6 +376,8 @@
kOperandQTVRHotSpotsVisible = 4100
kOperandQTVRViewCenterH = 4101
kOperandQTVRViewCenterV = 4102
+kOperandQTVRViewStateCount = 4103
+kOperandQTVRViewState = 4104
kOperandMouseLocalHLoc = 5120
kOperandMouseLocalVLoc = 5121
kOperandKeyIsDown = 5122
@@ -384,19 +413,19 @@
kOperandStringSubString = 10242
kOperandStringConcat = 10243
kFirstMovieAction = kActionMovieSetVolume
-kLastMovieAction = kActionMovieRestartAtTime
+kLastMovieAction = kActionMovieSetScale
kFirstTrackAction = kActionTrackSetVolume
kLastTrackAction = kActionTrackSetBassTreble
kFirstSpriteAction = kActionSpriteSetMatrix
-kLastSpriteAction = kActionSpriteStretch
+kLastSpriteAction = kActionSpriteSetCanBeHitTested
kFirstQTVRAction = kActionQTVRSetPanAngle
-kLastQTVRAction = kActionQTVRTranslateObject
+kLastQTVRAction = kActionQTVRSetViewState
kFirstMusicAction = kActionMusicPlayNote
kLastMusicAction = kActionMusicSetController
kFirstSystemAction = kActionCase
-kLastSystemAction = kActionDontPassKeyEvent
+kLastSystemAction = kActionSetRandomSeed
kFirstSpriteTrackAction = kActionSpriteTrackSetVariable
-kLastSpriteTrackAction = kActionSpriteTrackSetVariableToMovieBaseURL
+kLastSpriteTrackAction = kActionSpriteTrackDisposeImage
kFirstApplicationAction = kActionApplicationNumberAndString
kLastApplicationAction = kActionApplicationNumberAndString
kFirstQD3DNamedObjectAction = kActionQD3DNamedObjectTranslateTo
@@ -460,6 +489,7 @@
kQTEventMovieLoaded = FOUR_CHAR_CODE('load')
kQTEventRequestToModifyMovie = FOUR_CHAR_CODE('reqm')
kQTEventListReceived = FOUR_CHAR_CODE('list')
+kQTEventKeyUp = FOUR_CHAR_CODE('keyU')
kActionFlagActionIsDelta = 1L << 1
kActionFlagParameterWrapsAround = 1L << 2
kActionFlagActionIsToggle = 1L << 3
@@ -539,6 +569,7 @@
newMovieDontAutoUpdateClock = 1 << 5
newMovieAsyncOK = 1 << 8
newMovieIdleImportOK = 1 << 10
+newMovieDontInteractWithUser = 1 << 11
trackUsageInMovie = 1 << 1
trackUsageInPreview = 1 << 2
trackUsageInPoster = 1 << 3
@@ -594,10 +625,21 @@
hintsAllowDynamicResize = 1 << 19
hintsSingleField = 1 << 20
hintsNoRenderingTimeOut = 1 << 21
+hintsFlushVideoInsteadOfDirtying = 1 << 22
+hintsEnableSubPixelPositioning = 1L << 23
mediaHandlerFlagBaseClient = 1
movieTrackMediaType = 1 << 0
movieTrackCharacteristic = 1 << 1
movieTrackEnabledOnly = 1 << 2
+kMovieControlOptionHideController = (1L << 0)
+kMovieControlOptionLocateTopLeft = (1L << 1)
+kMovieControlOptionEnableEditing = (1L << 2)
+kMovieControlOptionHandleEditingHI = (1L << 3)
+kMovieControlOptionSetKeysEnabled = (1L << 4)
+kMovieControlOptionManuallyIdled = (1L << 5)
+kMovieControlDataMovieController = FOUR_CHAR_CODE('mc ')
+kMovieControlDataMovie = FOUR_CHAR_CODE('moov')
+kMovieControlDataManualIdling = FOUR_CHAR_CODE('manu')
movieDrawingCallWhenChanged = 0
movieDrawingCallAlways = 1
kQTCloneShareSamples = 1 << 0
@@ -609,6 +651,8 @@
kGetMovieImporterAutoImportOnly = 1L << 10
kQTGetMIMETypeInfoIsQuickTimeMovieType = FOUR_CHAR_CODE('moov')
kQTGetMIMETypeInfoIsUnhelpfulType = FOUR_CHAR_CODE('dumb')
+kQTCopyUserDataReplace = FOUR_CHAR_CODE('rplc')
+kQTCopyUserDataMerge = FOUR_CHAR_CODE('merg')
kMovieLoadStateError = -1L
kMovieLoadStateLoading = 1000
kMovieLoadStateLoaded = 2000
@@ -627,6 +671,16 @@
fullScreenDontChangeMenuBar = 1L << 2
fullScreenPreflightSize = 1L << 3
movieExecuteWiredActionDontExecute = 1L << 0
+kRefConNavigationNext = 0
+kRefConNavigationPrevious = 1
+kRefConPropertyCanHaveFocus = 1
+kRefConPropertyHasFocus = 2
+kTrackFocusCanEditFlag = FOUR_CHAR_CODE('kedt')
+kTrackDefaultFocusFlags = FOUR_CHAR_CODE('kfoc')
+kTrackFocusDefaultRefcon = FOUR_CHAR_CODE('kref')
+kTrackFocusOn = 1
+kTrackHandlesTabs = 2
+kFlashTrackPropertyAcceptAllClicks = FOUR_CHAR_CODE('clik')
kBackgroundSpriteLayerNum = 32767
kSpritePropertyMatrix = 1
kSpritePropertyImageDescription = 2
@@ -636,6 +690,7 @@
kSpritePropertyGraphicsMode = 6
kSpritePropertyImageDataSize = 7
kSpritePropertyActionHandlingSpriteID = 8
+kSpritePropertyCanBeHitTested = 9
kSpritePropertyImageIndex = 100
kSpriteTrackPropertyBackgroundColor = 101
kSpriteTrackPropertyOffscreenBitDepth = 102
@@ -644,9 +699,18 @@
kSpriteTrackPropertyHasActions = 105
kSpriteTrackPropertyVisible = 106
kSpriteTrackPropertyQTIdleEventsFrequency = 107
+kSpriteTrackPropertyAllSpritesHitTestingMode = 108
+kSpriteTrackPropertyPreferredDepthInterpretationMode = 109
kSpriteImagePropertyRegistrationPoint = 1000
kSpriteImagePropertyGroupID = 1001
+kSpriteTrackPreferredDepthCompatibilityMode = 0
+kSpriteTrackPreferredDepthModernMode = 1
+kSpriteHitTestUseSpritesOwnPropertiesMode = 0
+kSpriteHitTestTreatAllSpritesAsHitTestableMode = 1
+kSpriteHitTestTreatAllSpritesAsNotHitTestableMode = 2
kNoQTIdleEvents = -1
+kGetSpriteWorldInvalidRegionAndLeaveIntact = -1L
+kGetSpriteWorldInvalidRegionAndThenSetEmpty = -2L
kOnlyDrawToSpriteWorld = 1L << 0
kSpriteWorldPreflight = 1L << 1
kSpriteWorldDidDraw = 1L << 0
@@ -657,7 +721,10 @@
kSpriteWorldHighQuality = 1L << 2
kSpriteWorldDontAutoInvalidate = 1L << 3
kSpriteWorldInvisible = 1L << 4
+kSpriteWorldDirtyInsteadOfFlush = 1L << 5
kParentAtomIsContainer = 0
+kTweenRecordNoFlags = 0
+kTweenRecordIsAtInterruptTime = 0x00000001
kEffectNameAtom = FOUR_CHAR_CODE('name')
kEffectTypeAtom = FOUR_CHAR_CODE('type')
kEffectManufacturerAtom = FOUR_CHAR_CODE('manu')
@@ -673,11 +740,41 @@
pdActionActivateSubPanel = 10
pdActionConductStopAlert = 11
pdActionModelessCallback = 12
-pdActionFetchPreview = 13
+pdActionFetchPreview = 13
+pdActionSetDialogSettings = 14
+pdActionGetDialogSettings = 15
+pdActionGetNextSample = 16
+pdActionGetPreviousSample = 17
+pdActionCompactSample = 18
+pdActionSetEditCallout = 19
+pdActionSetSampleTime = 20
+pdActionDoEditCommand = 21
+pdActionGetSubPanelMenuValue = 22
+pdActionCustomNewControl = 23
+pdActionCustomDisposeControl = 24
+pdActionCustomPositionControl = 25
+pdActionCustomShowHideControl = 26
+pdActionCustomHandleEvent = 27
+pdActionCustomSetFocus = 28
+pdActionCustomSetEditMenu = 29
+pdActionCustomSetPreviewPicture = 30
+pdActionCustomSetEditCallout = 31
+pdActionCustomGetEnableValue = 32
+pdActionCustomSetSampleTime = 33
+pdActionCustomGetValue = 34
+pdActionCustomDoEditCommand = 35
+pdSampleTimeDisplayOptionsNone = 0x00000000
+pdActionFocusOff = 0
+pdActionFocusFirst = 1
+pdActionFocusLast = 2
+pdActionFocusForward = 3
+pdActionFocusBackward = 4
elOptionsIncludeNoneInList = 0x00000001
pdOptionsCollectOneValue = 0x00000001
pdOptionsAllowOptionalInterpolations = 0x00000002
-pdOptionsModalDialogBox = 0x00000004
+pdOptionsModalDialogBox = 0x00000004
+pdOptionsEditCurrentEffectOnly = 0x00000008
+pdOptionsHidePreview = 0x00000010
effectIsRealtime = 0
kAccessKeyAtomType = FOUR_CHAR_CODE('acky')
kAccessKeySystemFlag = 1L << 0
@@ -738,6 +835,7 @@
kTrackModifierTiltAngle = FOUR_CHAR_CODE('tilt')
kTrackModifierVerticalFieldOfViewAngle = FOUR_CHAR_CODE('fov ')
kTrackModifierObjectQTEventSend = FOUR_CHAR_CODE('evnt')
+kTrackModifierObjectCanBeHitTested = 15
kTweenTypeShort = 1
kTweenTypeLong = 2
kTweenTypeFixed = 3
@@ -792,6 +890,18 @@
kInitialRotationAtom = FOUR_CHAR_CODE('inro')
kNonLinearTweenHeader = FOUR_CHAR_CODE('nlth')
kTweenReturnDelta = 1L << 0
+kQTRestrictionClassSave = FOUR_CHAR_CODE('save')
+kQTRestrictionSaveDontAddMovieResource = (1L << 0)
+kQTRestrictionSaveDontFlatten = (1L << 1)
+kQTRestrictionSaveDontExport = (1L << 2)
+kQTRestrictionSaveDontExtract = (1L << 3)
+kQTRestrictionClassEdit = FOUR_CHAR_CODE('edit')
+kQTRestrictionEditDontCopy = (1L << 0)
+kQTRestrictionEditDontCut = (1L << 1)
+kQTRestrictionEditDontPaste = (1L << 2)
+kQTRestrictionEditDontClear = (1L << 3)
+kQTRestrictionEditDontModify = (1L << 4)
+kQTRestrictionEditDontExtract = (1L << 5)
videoFlagDontLeanAhead = 1L << 0
txtProcDefaultDisplay = 0
txtProcDontDisplay = 1
@@ -807,7 +917,8 @@
spriteHitTestImage = 1L << 1
spriteHitTestInvisibleSprites = 1L << 2
spriteHitTestIsClick = 1L << 3
-spriteHitTestLocInDisplayCoordinates = 1L << 4
+spriteHitTestLocInDisplayCoordinates = 1L << 4
+spriteHitTestTreatAllSpritesAsHitTestable = 1L << 5
kSpriteAtomType = FOUR_CHAR_CODE('sprt')
kSpriteImagesContainerAtomType = FOUR_CHAR_CODE('imct')
kSpriteImageAtomType = FOUR_CHAR_CODE('imag')
@@ -1009,6 +1120,7 @@
kQTCursorDownArrow = -19178
kQTCursorUpArrow = -19177
kQTCursorIBeam = -19176
+kControllerUnderstandsIdleManagers = 1 << 0
kVideoMediaResetStatisticsSelect = 0x0105
kVideoMediaGetStatisticsSelect = 0x0106
kVideoMediaGetStallCountSelect = 0x010E
@@ -1049,6 +1161,10 @@
kSpriteMediaDisposeSpriteSelect = 0x0115
kSpriteMediaSetActionVariableToStringSelect = 0x0116
kSpriteMediaGetActionVariableAsStringSelect = 0x0117
+kSpriteMediaNewImageSelect = 0x011B
+kSpriteMediaDisposeImageSelect = 0x011C
+kSpriteMediaImageIndexToIDSelect = 0x011D
+kSpriteMediaImageIDToIndexSelect = 0x011E
kFlashMediaSetPanSelect = 0x0101
kFlashMediaSetZoomSelect = 0x0102
kFlashMediaSetZoomRectSelect = 0x0103
@@ -1131,4 +1247,6 @@
kMCGetDoActionsProcSelect = 0x0032
kMCAddMovieSegmentSelect = 0x0033
kMCTrimMovieSegmentSelect = 0x0034
+kMCSetIdleManagerSelect = 0x0035
+kMCSetControllerCapabilitiesSelect = 0x0036
kMusicMediaGetIndexedTunePlayerSelect = 0x0101