still untested (but it compiles)

Mac/Modules/qt/qtgen.py

@@ -24,14 +24,14 @@ f = Method(void, 'MoviesTask',
     (Movie, 'theMovie', InMode),
     (long, 'maxMilliSecToUse', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(OSErr, 'PrerollMovie',
     (Movie, 'theMovie', InMode),
     (TimeValue, 'time', InMode),
     (Fixed, 'Rate', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(OSErr, 'LoadMovieIntoRam',
     (Movie, 'theMovie', InMode),
@@ -39,119 +39,200 @@ f = Method(OSErr, 'LoadMovieIntoRam',
     (TimeValue, 'duration', InMode),
     (long, 'flags', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
+
+f = Method(OSErr, 'LoadTrackIntoRam',
+    (Track, 'theTrack', InMode),
+    (TimeValue, 'time', InMode),
+    (TimeValue, 'duration', InMode),
+    (long, 'flags', InMode),
+)
+Track_methods.append(f)
+
+f = Method(OSErr, 'LoadMediaIntoRam',
+    (Media, 'theMedia', InMode),
+    (TimeValue, 'time', InMode),
+    (TimeValue, 'duration', InMode),
+    (long, 'flags', InMode),
+)
+Media_methods.append(f)
 
 f = Method(void, 'SetMovieActive',
     (Movie, 'theMovie', InMode),
     (Boolean, 'active', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(Boolean, 'GetMovieActive',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'StartMovie',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'StopMovie',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'GoToBeginningOfMovie',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'GoToEndOfMovie',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(Boolean, 'IsMovieDone',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(Boolean, 'GetMoviePreviewMode',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'SetMoviePreviewMode',
     (Movie, 'theMovie', InMode),
     (Boolean, 'usePreview', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'ShowMoviePoster',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
+
+f = Method(TimeBase, 'GetMovieTimeBase',
+    (Movie, 'theMovie', InMode),
+)
+Movie_methods.append(f)
+
+f = Method(Track, 'GetNextTrackForCompositing',
+    (Movie, 'theMovie', InMode),
+    (Track, 'theTrack', InMode),
+)
+Movie_methods.append(f)
+
+f = Method(Track, 'GetPrevTrackForCompositing',
+    (Movie, 'theMovie', InMode),
+    (Track, 'theTrack', InMode),
+)
+Movie_methods.append(f)
 
 f = Method(PicHandle, 'GetMoviePict',
     (Movie, 'theMovie', InMode),
     (TimeValue, 'time', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
+
+f = Method(PicHandle, 'GetTrackPict',
+    (Track, 'theTrack', InMode),
+    (TimeValue, 'time', InMode),
+)
+Track_methods.append(f)
 
 f = Method(PicHandle, 'GetMoviePosterPict',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(OSErr, 'UpdateMovie',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'GetMovieBox',
     (Movie, 'theMovie', InMode),
     (Rect, 'boxRect', OutMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'SetMovieBox',
     (Movie, 'theMovie', InMode),
     (Rect_ptr, 'boxRect', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(RgnHandle, 'GetMovieDisplayClipRgn',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'SetMovieDisplayClipRgn',
     (Movie, 'theMovie', InMode),
     (RgnHandle, 'theClip', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(RgnHandle, 'GetMovieClipRgn',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'SetMovieClipRgn',
     (Movie, 'theMovie', InMode),
     (RgnHandle, 'theClip', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
+
+f = Method(RgnHandle, 'GetTrackClipRgn',
+    (Track, 'theTrack', InMode),
+)
+Track_methods.append(f)
+
+f = Method(void, 'SetTrackClipRgn',
+    (Track, 'theTrack', InMode),
+    (RgnHandle, 'theClip', InMode),
+)
+Track_methods.append(f)
 
 f = Method(RgnHandle, 'GetMovieDisplayBoundsRgn',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
+
+f = Method(RgnHandle, 'GetTrackDisplayBoundsRgn',
+    (Track, 'theTrack', InMode),
+)
+Track_methods.append(f)
 
 f = Method(RgnHandle, 'GetMovieBoundsRgn',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
+
+f = Method(RgnHandle, 'GetTrackMovieBoundsRgn',
+    (Track, 'theTrack', InMode),
+)
+Track_methods.append(f)
+
+f = Method(RgnHandle, 'GetTrackBoundsRgn',
+    (Track, 'theTrack', InMode),
+)
+Track_methods.append(f)
+
+f = Method(PixMapHandle, 'GetTrackMatte',
+    (Track, 'theTrack', InMode),
+)
+Track_methods.append(f)
+
+f = Method(void, 'SetTrackMatte',
+    (Track, 'theTrack', InMode),
+    (PixMapHandle, 'theMatte', InMode),
+)
+Track_methods.append(f)
+
+f = Function(void, 'DisposeMatte',
+    (PixMapHandle, 'theMatte', InMode),
+)
+functions.append(f)
 
 f = Function(Movie, 'NewMovie',
     (long, 'flags', InMode),
@@ -162,7 +243,7 @@ f = Method(OSErr, 'PutMovieIntoHandle',
     (Movie, 'theMovie', InMode),
     (Handle, 'publicMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(OSErr, 'PutMovieIntoDataFork',
     (Movie, 'theMovie', InMode),
@@ -170,142 +251,542 @@ f = Method(OSErr, 'PutMovieIntoDataFork',
     (long, 'offset', InMode),
     (long, 'maxSize', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(TimeScale, 'GetMovieTimeScale',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'SetMovieTimeScale',
     (Movie, 'theMovie', InMode),
     (TimeScale, 'timeScale', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(TimeValue, 'GetMovieDuration',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(Fixed, 'GetMovieRate',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'SetMovieRate',
     (Movie, 'theMovie', InMode),
     (Fixed, 'rate', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(Fixed, 'GetMoviePreferredRate',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'SetMoviePreferredRate',
     (Movie, 'theMovie', InMode),
     (Fixed, 'rate', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(short, 'GetMoviePreferredVolume',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'SetMoviePreferredVolume',
     (Movie, 'theMovie', InMode),
     (short, 'volume', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(short, 'GetMovieVolume',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'SetMovieVolume',
     (Movie, 'theMovie', InMode),
     (short, 'volume', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'GetMoviePreviewTime',
     (Movie, 'theMovie', InMode),
     (TimeValue, 'previewTime', OutMode),
     (TimeValue, 'previewDuration', OutMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'SetMoviePreviewTime',
     (Movie, 'theMovie', InMode),
     (TimeValue, 'previewTime', InMode),
     (TimeValue, 'previewDuration', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(TimeValue, 'GetMoviePosterTime',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'SetMoviePosterTime',
     (Movie, 'theMovie', InMode),
     (TimeValue, 'posterTime', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'GetMovieSelection',
     (Movie, 'theMovie', InMode),
     (TimeValue, 'selectionTime', OutMode),
     (TimeValue, 'selectionDuration', OutMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'SetMovieSelection',
     (Movie, 'theMovie', InMode),
     (TimeValue, 'selectionTime', InMode),
     (TimeValue, 'selectionDuration', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'SetMovieActiveSegment',
     (Movie, 'theMovie', InMode),
     (TimeValue, 'startTime', InMode),
     (TimeValue, 'duration', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'GetMovieActiveSegment',
     (Movie, 'theMovie', InMode),
     (TimeValue, 'startTime', OutMode),
     (TimeValue, 'duration', OutMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'SetMovieTimeValue',
     (Movie, 'theMovie', InMode),
     (TimeValue, 'newtime', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
+
+f = Method(UserData, 'GetMovieUserData',
+    (Movie, 'theMovie', InMode),
+)
+Movie_methods.append(f)
 
 f = Method(long, 'GetMovieTrackCount',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
+
+f = Method(Track, 'GetMovieTrack',
+    (Movie, 'theMovie', InMode),
+    (long, 'trackID', InMode),
+)
+Movie_methods.append(f)
+
+f = Method(Track, 'GetMovieIndTrack',
+    (Movie, 'theMovie', InMode),
+    (long, 'index', InMode),
+)
+Movie_methods.append(f)
+
+f = Method(Track, 'GetMovieIndTrackType',
+    (Movie, 'theMovie', InMode),
+    (long, 'index', InMode),
+    (OSType, 'trackType', InMode),
+    (long, 'flags', InMode),
+)
+Movie_methods.append(f)
+
+f = Method(long, 'GetTrackID',
+    (Track, 'theTrack', InMode),
+)
+Track_methods.append(f)
+
+f = Method(Movie, 'GetTrackMovie',
+    (Track, 'theTrack', InMode),
+)
+Track_methods.append(f)
+
+f = Method(Track, 'NewMovieTrack',
+    (Movie, 'theMovie', InMode),
+    (Fixed, 'width', InMode),
+    (Fixed, 'height', InMode),
+    (short, 'trackVolume', InMode),
+)
+Movie_methods.append(f)
+
+f = Method(Boolean, 'GetTrackEnabled',
+    (Track, 'theTrack', InMode),
+)
+Track_methods.append(f)
+
+f = Method(void, 'SetTrackEnabled',
+    (Track, 'theTrack', InMode),
+    (Boolean, 'isEnabled', InMode),
+)
+Track_methods.append(f)
+
+f = Method(long, 'GetTrackUsage',
+    (Track, 'theTrack', InMode),
+)
+Track_methods.append(f)
+
+f = Method(void, 'SetTrackUsage',
+    (Track, 'theTrack', InMode),
+    (long, 'usage', InMode),
+)
+Track_methods.append(f)
+
+f = Method(TimeValue, 'GetTrackDuration',
+    (Track, 'theTrack', InMode),
+)
+Track_methods.append(f)
+
+f = Method(TimeValue, 'GetTrackOffset',
+    (Track, 'theTrack', InMode),
+)
+Track_methods.append(f)
+
+f = Method(void, 'SetTrackOffset',
+    (Track, 'theTrack', InMode),
+    (TimeValue, 'movieOffsetTime', InMode),
+)
+Track_methods.append(f)
+
+f = Method(short, 'GetTrackLayer',
+    (Track, 'theTrack', InMode),
+)
+Track_methods.append(f)
+
+f = Method(void, 'SetTrackLayer',
+    (Track, 'theTrack', InMode),
+    (short, 'layer', InMode),
+)
+Track_methods.append(f)
+
+f = Method(Track, 'GetTrackAlternate',
+    (Track, 'theTrack', InMode),
+)
+Track_methods.append(f)
+
+f = Method(void, 'SetTrackAlternate',
+    (Track, 'theTrack', InMode),
+    (Track, 'alternateT', InMode),
+)
+Track_methods.append(f)
 
 f = Method(void, 'SetAutoTrackAlternatesEnabled',
     (Movie, 'theMovie', InMode),
     (Boolean, 'enable', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'SelectMovieAlternates',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
+
+f = Method(short, 'GetTrackVolume',
+    (Track, 'theTrack', InMode),
+)
+Track_methods.append(f)
+
+f = Method(void, 'SetTrackVolume',
+    (Track, 'theTrack', InMode),
+    (short, 'volume', InMode),
+)
+Track_methods.append(f)
+
+f = Method(void, 'GetTrackDimensions',
+    (Track, 'theTrack', InMode),
+    (Fixed, 'width', OutMode),
+    (Fixed, 'height', OutMode),
+)
+Track_methods.append(f)
+
+f = Method(void, 'SetTrackDimensions',
+    (Track, 'theTrack', InMode),
+    (Fixed, 'width', InMode),
+    (Fixed, 'height', InMode),
+)
+Track_methods.append(f)
+
+f = Method(UserData, 'GetTrackUserData',
+    (Track, 'theTrack', InMode),
+)
+Track_methods.append(f)
+
+f = Method(Media, 'NewTrackMedia',
+    (Track, 'theTrack', InMode),
+    (OSType, 'mediaType', InMode),
+    (TimeScale, 'timeScale', InMode),
+    (Handle, 'dataRef', InMode),
+    (OSType, 'dataRefType', InMode),
+)
+Track_methods.append(f)
+
+f = Method(Media, 'GetTrackMedia',
+    (Track, 'theTrack', InMode),
+)
+Track_methods.append(f)
+
+f = Method(Track, 'GetMediaTrack',
+    (Media, 'theMedia', InMode),
+)
+Media_methods.append(f)
+
+f = Method(TimeScale, 'GetMediaTimeScale',
+    (Media, 'theMedia', InMode),
+)
+Media_methods.append(f)
+
+f = Method(void, 'SetMediaTimeScale',
+    (Media, 'theMedia', InMode),
+    (TimeScale, 'timeScale', InMode),
+)
+Media_methods.append(f)
+
+f = Method(TimeValue, 'GetMediaDuration',
+    (Media, 'theMedia', InMode),
+)
+Media_methods.append(f)
+
+f = Method(short, 'GetMediaLanguage',
+    (Media, 'theMedia', InMode),
+)
+Media_methods.append(f)
+
+f = Method(void, 'SetMediaLanguage',
+    (Media, 'theMedia', InMode),
+    (short, 'language', InMode),
+)
+Media_methods.append(f)
+
+f = Method(short, 'GetMediaQuality',
+    (Media, 'theMedia', InMode),
+)
+Media_methods.append(f)
+
+f = Method(void, 'SetMediaQuality',
+    (Media, 'theMedia', InMode),
+    (short, 'quality', InMode),
+)
+Media_methods.append(f)
+
+f = Method(void, 'GetMediaHandlerDescription',
+    (Media, 'theMedia', InMode),
+    (OSType, 'mediaType', OutMode),
+    (Str255, 'creatorName', InMode),
+    (OSType, 'creatorManufacturer', OutMode),
+)
+Media_methods.append(f)
+
+f = Method(UserData, 'GetMediaUserData',
+    (Media, 'theMedia', InMode),
+)
+Media_methods.append(f)
+
+f = Method(MediaHandler, 'GetMediaHandler',
+    (Media, 'theMedia', InMode),
+)
+Media_methods.append(f)
+
+f = Method(OSErr, 'SetMediaHandler',
+    (Media, 'theMedia', InMode),
+    (MediaHandlerComponent, 'mH', InMode),
+)
+Media_methods.append(f)
+
+f = Method(OSErr, 'BeginMediaEdits',
+    (Media, 'theMedia', InMode),
+)
+Media_methods.append(f)
+
+f = Method(OSErr, 'EndMediaEdits',
+    (Media, 'theMedia', InMode),
+)
+Media_methods.append(f)
+
+f = Method(OSErr, 'SetMediaDefaultDataRefIndex',
+    (Media, 'theMedia', InMode),
+    (short, 'index', InMode),
+)
+Media_methods.append(f)
+
+f = Method(void, 'GetMediaDataHandlerDescription',
+    (Media, 'theMedia', InMode),
+    (short, 'index', InMode),
+    (OSType, 'dhType', OutMode),
+    (Str255, 'creatorName', InMode),
+    (OSType, 'creatorManufacturer', OutMode),
+)
+Media_methods.append(f)
+
+f = Method(DataHandler, 'GetMediaDataHandler',
+    (Media, 'theMedia', InMode),
+    (short, 'index', InMode),
+)
+Media_methods.append(f)
+
+f = Method(OSErr, 'SetMediaDataHandler',
+    (Media, 'theMedia', InMode),
+    (short, 'index', InMode),
+    (DataHandlerComponent, 'dataHandler', InMode),
+)
+Media_methods.append(f)
+
+f = Function(Component, 'GetDataHandler',
+    (Handle, 'dataRef', InMode),
+    (OSType, 'dataHandlerSubType', InMode),
+    (long, 'flags', InMode),
+)
+functions.append(f)
+
+f = Method(long, 'GetMediaSampleDescriptionCount',
+    (Media, 'theMedia', InMode),
+)
+Media_methods.append(f)
+
+f = Method(void, 'GetMediaSampleDescription',
+    (Media, 'theMedia', InMode),
+    (long, 'index', InMode),
+    (SampleDescriptionHandle, 'descH', InMode),
+)
+Media_methods.append(f)
+
+f = Method(OSErr, 'SetMediaSampleDescription',
+    (Media, 'theMedia', InMode),
+    (long, 'index', InMode),
+    (SampleDescriptionHandle, 'descH', InMode),
+)
+Media_methods.append(f)
+
+f = Method(long, 'GetMediaSampleCount',
+    (Media, 'theMedia', InMode),
+)
+Media_methods.append(f)
+
+f = Method(void, 'SampleNumToMediaTime',
+    (Media, 'theMedia', InMode),
+    (long, 'logicalSampleNum', InMode),
+    (TimeValue, 'sampleTime', OutMode),
+    (TimeValue, 'sampleDuration', OutMode),
+)
+Media_methods.append(f)
+
+f = Method(void, 'MediaTimeToSampleNum',
+    (Media, 'theMedia', InMode),
+    (TimeValue, 'time', InMode),
+    (long, 'sampleNum', OutMode),
+    (TimeValue, 'sampleTime', OutMode),
+    (TimeValue, 'sampleDuration', OutMode),
+)
+Media_methods.append(f)
+
+f = Method(OSErr, 'AddMediaSample',
+    (Media, 'theMedia', InMode),
+    (Handle, 'dataIn', InMode),
+    (long, 'inOffset', InMode),
+    (unsigned_long, 'size', InMode),
+    (TimeValue, 'durationPerSample', InMode),
+    (SampleDescriptionHandle, 'sampleDescriptionH', InMode),
+    (long, 'numberOfSamples', InMode),
+    (short, 'sampleFlags', InMode),
+    (TimeValue, 'sampleTime', OutMode),
+)
+Media_methods.append(f)
+
+f = Method(OSErr, 'AddMediaSampleReference',
+    (Media, 'theMedia', InMode),
+    (long, 'dataOffset', InMode),
+    (unsigned_long, 'size', InMode),
+    (TimeValue, 'durationPerSample', InMode),
+    (SampleDescriptionHandle, 'sampleDescriptionH', InMode),
+    (long, 'numberOfSamples', InMode),
+    (short, 'sampleFlags', InMode),
+    (TimeValue, 'sampleTime', OutMode),
+)
+Media_methods.append(f)
+
+f = Method(OSErr, 'GetMediaSample',
+    (Media, 'theMedia', InMode),
+    (Handle, 'dataOut', InMode),
+    (long, 'maxSizeToGrow', InMode),
+    (long, 'size', OutMode),
+    (TimeValue, 'time', InMode),
+    (TimeValue, 'sampleTime', OutMode),
+    (TimeValue, 'durationPerSample', OutMode),
+    (SampleDescriptionHandle, 'sampleDescriptionH', InMode),
+    (long, 'sampleDescriptionIndex', OutMode),
+    (long, 'maxNumberOfSamples', InMode),
+    (long, 'numberOfSamples', OutMode),
+    (short, 'sampleFlags', OutMode),
+)
+Media_methods.append(f)
+
+f = Method(OSErr, 'GetMediaSampleReference',
+    (Media, 'theMedia', InMode),
+    (long, 'dataOffset', OutMode),
+    (long, 'size', OutMode),
+    (TimeValue, 'time', InMode),
+    (TimeValue, 'sampleTime', OutMode),
+    (TimeValue, 'durationPerSample', OutMode),
+    (SampleDescriptionHandle, 'sampleDescriptionH', InMode),
+    (long, 'sampleDescriptionIndex', OutMode),
+    (long, 'maxNumberOfSamples', InMode),
+    (long, 'numberOfSamples', OutMode),
+    (short, 'sampleFlags', OutMode),
+)
+Media_methods.append(f)
+
+f = Method(OSErr, 'SetMediaPreferredChunkSize',
+    (Media, 'theMedia', InMode),
+    (long, 'maxChunkSize', InMode),
+)
+Media_methods.append(f)
+
+f = Method(OSErr, 'GetMediaPreferredChunkSize',
+    (Media, 'theMedia', InMode),
+    (long, 'maxChunkSize', OutMode),
+)
+Media_methods.append(f)
+
+f = Method(OSErr, 'SetMediaShadowSync',
+    (Media, 'theMedia', InMode),
+    (long, 'frameDiffSampleNum', InMode),
+    (long, 'syncSampleNum', InMode),
+)
+Media_methods.append(f)
+
+f = Method(OSErr, 'GetMediaShadowSync',
+    (Media, 'theMedia', InMode),
+    (long, 'frameDiffSampleNum', InMode),
+    (long, 'syncSampleNum', OutMode),
+)
+Media_methods.append(f)
+
+f = Method(OSErr, 'InsertMediaIntoTrack',
+    (Track, 'theTrack', InMode),
+    (TimeValue, 'trackStart', InMode),
+    (TimeValue, 'mediaTime', InMode),
+    (TimeValue, 'mediaDuration', InMode),
+    (Fixed, 'mediaRate', InMode),
+)
+Track_methods.append(f)
+
+f = Method(OSErr, 'InsertTrackSegment',
+    (Track, 'srcTrack', InMode),
+    (Track, 'dstTrack', InMode),
+    (TimeValue, 'srcIn', InMode),
+    (TimeValue, 'srcDuration', InMode),
+    (TimeValue, 'dstIn', InMode),
+)
+Track_methods.append(f)
 
 f = Method(OSErr, 'InsertMovieSegment',
     (Movie, 'srcMovie', InMode),
@@ -314,21 +795,43 @@ f = Method(OSErr, 'InsertMovieSegment',
     (TimeValue, 'srcDuration', InMode),
     (TimeValue, 'dstIn', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
+
+f = Method(OSErr, 'InsertEmptyTrackSegment',
+    (Track, 'dstTrack', InMode),
+    (TimeValue, 'dstIn', InMode),
+    (TimeValue, 'dstDuration', InMode),
+)
+Track_methods.append(f)
 
 f = Method(OSErr, 'InsertEmptyMovieSegment',
     (Movie, 'dstMovie', InMode),
     (TimeValue, 'dstIn', InMode),
     (TimeValue, 'dstDuration', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
+
+f = Method(OSErr, 'DeleteTrackSegment',
+    (Track, 'theTrack', InMode),
+    (TimeValue, 'startTime', InMode),
+    (TimeValue, 'duration', InMode),
+)
+Track_methods.append(f)
 
 f = Method(OSErr, 'DeleteMovieSegment',
     (Movie, 'theMovie', InMode),
     (TimeValue, 'startTime', InMode),
     (TimeValue, 'duration', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
+
+f = Method(OSErr, 'ScaleTrackSegment',
+    (Track, 'theTrack', InMode),
+    (TimeValue, 'startTime', InMode),
+    (TimeValue, 'oldDuration', InMode),
+    (TimeValue, 'newDuration', InMode),
+)
+Track_methods.append(f)
 
 f = Method(OSErr, 'ScaleMovieSegment',
     (Movie, 'theMovie', InMode),
@@ -336,34 +839,34 @@ f = Method(OSErr, 'ScaleMovieSegment',
     (TimeValue, 'oldDuration', InMode),
     (TimeValue, 'newDuration', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(Movie, 'CutMovieSelection',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(Movie, 'CopyMovieSelection',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'PasteMovieSelection',
     (Movie, 'theMovie', InMode),
     (Movie, 'src', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'AddMovieSelection',
     (Movie, 'theMovie', InMode),
     (Movie, 'src', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'ClearMovieSelection',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Function(OSErr, 'PasteHandleIntoMovie',
     (Handle, 'h', InMode),
@@ -374,30 +877,246 @@ f = Function(OSErr, 'PasteHandleIntoMovie',
 )
 functions.append(f)
 
+f = Method(OSErr, 'PutMovieIntoTypedHandle',
+    (Movie, 'theMovie', InMode),
+    (Track, 'targetTrack', InMode),
+    (OSType, 'handleType', InMode),
+    (Handle, 'publicMovie', InMode),
+    (TimeValue, 'start', InMode),
+    (TimeValue, 'dur', InMode),
+    (long, 'flags', InMode),
+    (ComponentInstance, 'userComp', InMode),
+)
+Movie_methods.append(f)
+
+f = Method(Component, 'IsScrapMovie',
+    (Track, 'targetTrack', InMode),
+)
+Track_methods.append(f)
+
+f = Method(OSErr, 'CopyTrackSettings',
+    (Track, 'srcTrack', InMode),
+    (Track, 'dstTrack', InMode),
+)
+Track_methods.append(f)
+
 f = Method(OSErr, 'CopyMovieSettings',
     (Movie, 'srcMovie', InMode),
     (Movie, 'dstMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
+
+f = Method(OSErr, 'AddEmptyTrackToMovie',
+    (Track, 'srcTrack', InMode),
+    (Movie, 'dstMovie', InMode),
+    (Handle, 'dataRef', InMode),
+    (OSType, 'dataRefType', InMode),
+    (Track, 'dstTrack', OutMode),
+)
+Track_methods.append(f)
+
+f = Method(OSErr, 'AddTrackReference',
+    (Track, 'theTrack', InMode),
+    (Track, 'refTrack', InMode),
+    (OSType, 'refType', InMode),
+    (long, 'addedIndex', OutMode),
+)
+Track_methods.append(f)
+
+f = Method(OSErr, 'DeleteTrackReference',
+    (Track, 'theTrack', InMode),
+    (OSType, 'refType', InMode),
+    (long, 'index', InMode),
+)
+Track_methods.append(f)
+
+f = Method(OSErr, 'SetTrackReference',
+    (Track, 'theTrack', InMode),
+    (Track, 'refTrack', InMode),
+    (OSType, 'refType', InMode),
+    (long, 'index', InMode),
+)
+Track_methods.append(f)
+
+f = Method(Track, 'GetTrackReference',
+    (Track, 'theTrack', InMode),
+    (OSType, 'refType', InMode),
+    (long, 'index', InMode),
+)
+Track_methods.append(f)
+
+f = Method(OSType, 'GetNextTrackReferenceType',
+    (Track, 'theTrack', InMode),
+    (OSType, 'refType', InMode),
+)
+Track_methods.append(f)
+
+f = Method(long, 'GetTrackReferenceCount',
+    (Track, 'theTrack', InMode),
+    (OSType, 'refType', InMode),
+)
+Track_methods.append(f)
+
+f = Method(OSErr, 'ConvertMovieToFile',
+    (Movie, 'theMovie', InMode),
+    (Track, 'onlyTrack', InMode),
+    (FSSpec_ptr, 'outputFile', InMode),
+    (OSType, 'fileType', InMode),
+    (OSType, 'creator', InMode),
+    (ScriptCode, 'scriptTag', InMode),
+    (short, 'resID', OutMode),
+    (long, 'flags', InMode),
+    (ComponentInstance, 'userComp', InMode),
+)
+Movie_methods.append(f)
+
+f = Function(TimeValue, 'TrackTimeToMediaTime',
+    (TimeValue, 'value', InMode),
+    (Track, 'theTrack', InMode),
+)
+functions.append(f)
+
+f = Method(Fixed, 'GetTrackEditRate',
+    (Track, 'theTrack', InMode),
+    (TimeValue, 'atTime', InMode),
+)
+Track_methods.append(f)
 
 f = Method(long, 'GetMovieDataSize',
     (Movie, 'theMovie', InMode),
     (TimeValue, 'startTime', InMode),
     (TimeValue, 'duration', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
+
+f = Method(long, 'GetTrackDataSize',
+    (Track, 'theTrack', InMode),
+    (TimeValue, 'startTime', InMode),
+    (TimeValue, 'duration', InMode),
+)
+Track_methods.append(f)
+
+f = Method(long, 'GetMediaDataSize',
+    (Media, 'theMedia', InMode),
+    (TimeValue, 'startTime', InMode),
+    (TimeValue, 'duration', InMode),
+)
+Media_methods.append(f)
 
 f = Method(Boolean, 'PtInMovie',
     (Movie, 'theMovie', InMode),
     (Point, 'pt', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
+
+f = Method(Boolean, 'PtInTrack',
+    (Track, 'theTrack', InMode),
+    (Point, 'pt', InMode),
+)
+Track_methods.append(f)
 
 f = Method(void, 'SetMovieLanguage',
     (Movie, 'theMovie', InMode),
     (long, 'language', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
+
+f = Method(OSErr, 'GetUserData',
+    (UserData, 'theUserData', InMode),
+    (Handle, 'data', InMode),
+    (OSType, 'udType', InMode),
+    (long, 'index', InMode),
+)
+UserData_methods.append(f)
+
+f = Method(OSErr, 'AddUserData',
+    (UserData, 'theUserData', InMode),
+    (Handle, 'data', InMode),
+    (OSType, 'udType', InMode),
+)
+UserData_methods.append(f)
+
+f = Method(OSErr, 'RemoveUserData',
+    (UserData, 'theUserData', InMode),
+    (OSType, 'udType', InMode),
+    (long, 'index', InMode),
+)
+UserData_methods.append(f)
+
+f = Method(short, 'CountUserDataType',
+    (UserData, 'theUserData', InMode),
+    (OSType, 'udType', InMode),
+)
+UserData_methods.append(f)
+
+f = Method(long, 'GetNextUserDataType',
+    (UserData, 'theUserData', InMode),
+    (OSType, 'udType', InMode),
+)
+UserData_methods.append(f)
+
+f = Method(OSErr, 'AddUserDataText',
+    (UserData, 'theUserData', InMode),
+    (Handle, 'data', InMode),
+    (OSType, 'udType', InMode),
+    (long, 'index', InMode),
+    (short, 'itlRegionTag', InMode),
+)
+UserData_methods.append(f)
+
+f = Method(OSErr, 'GetUserDataText',
+    (UserData, 'theUserData', InMode),
+    (Handle, 'data', InMode),
+    (OSType, 'udType', InMode),
+    (long, 'index', InMode),
+    (short, 'itlRegionTag', InMode),
+)
+UserData_methods.append(f)
+
+f = Method(OSErr, 'RemoveUserDataText',
+    (UserData, 'theUserData', InMode),
+    (OSType, 'udType', InMode),
+    (long, 'index', InMode),
+    (short, 'itlRegionTag', InMode),
+)
+UserData_methods.append(f)
+
+f = Function(OSErr, 'NewUserData',
+    (UserData, 'theUserData', OutMode),
+)
+functions.append(f)
+
+f = Function(OSErr, 'NewUserDataFromHandle',
+    (Handle, 'h', InMode),
+    (UserData, 'theUserData', OutMode),
+)
+functions.append(f)
+
+f = Method(OSErr, 'PutUserDataIntoHandle',
+    (UserData, 'theUserData', InMode),
+    (Handle, 'h', InMode),
+)
+UserData_methods.append(f)
+
+f = Method(void, 'GetMediaNextInterestingTime',
+    (Media, 'theMedia', InMode),
+    (short, 'interestingTimeFlags', InMode),
+    (TimeValue, 'time', InMode),
+    (Fixed, 'rate', InMode),
+    (TimeValue, 'interestingTime', OutMode),
+    (TimeValue, 'interestingDuration', OutMode),
+)
+Media_methods.append(f)
+
+f = Method(void, 'GetTrackNextInterestingTime',
+    (Track, 'theTrack', InMode),
+    (short, 'interestingTimeFlags', InMode),
+    (TimeValue, 'time', InMode),
+    (Fixed, 'rate', InMode),
+    (TimeValue, 'interestingTime', OutMode),
+    (TimeValue, 'interestingDuration', OutMode),
+)
+Track_methods.append(f)
 
 f = Method(void, 'GetMovieNextInterestingTime',
     (Movie, 'theMovie', InMode),
@@ -409,7 +1128,7 @@ f = Method(void, 'GetMovieNextInterestingTime',
     (TimeValue, 'interestingTime', OutMode),
     (TimeValue, 'interestingDuration', OutMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Function(OSErr, 'CreateMovieFile',
     (FSSpec_ptr, 'fileSpec', InMode),
@@ -465,24 +1184,13 @@ f = Function(OSErr, 'NewMovieFromDataFork',
 )
 functions.append(f)
 
-f = Function(OSErr, 'NewMovieFromUserProc',
-    (Movie, 'm', OutMode),
-    (short, 'flags', InMode),
-    (Boolean, 'dataRefWasChanged', OutMode),
-    (GetMovieUPP, 'getProc', InMode),
-    (void, 'refCon', OutMode),
-    (Handle, 'defaultDataRef', InMode),
-    (OSType, 'dataRefType', InMode),
-)
-functions.append(f)
-
 f = Method(OSErr, 'AddMovieResource',
     (Movie, 'theMovie', InMode),
     (short, 'resRefNum', InMode),
     (short, 'resId', OutMode),
     (ConstStr255Param, 'resName', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(OSErr, 'UpdateMovieResource',
     (Movie, 'theMovie', InMode),
@@ -490,7 +1198,7 @@ f = Method(OSErr, 'UpdateMovieResource',
     (short, 'resId', InMode),
     (ConstStr255Param, 'resName', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Function(OSErr, 'RemoveMovieResource',
     (short, 'resRefNum', InMode),
@@ -501,38 +1209,38 @@ functions.append(f)
 f = Method(Boolean, 'HasMovieChanged',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'ClearMovieChanged',
     (Movie, 'theMovie', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(OSErr, 'SetMovieDefaultDataRef',
     (Movie, 'theMovie', InMode),
     (Handle, 'dataRef', InMode),
     (OSType, 'dataRefType', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(OSErr, 'GetMovieDefaultDataRef',
     (Movie, 'theMovie', InMode),
     (Handle, 'dataRef', OutMode),
     (OSType, 'dataRefType', OutMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(OSErr, 'SetMovieColorTable',
     (Movie, 'theMovie', InMode),
     (CTabHandle, 'ctab', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(OSErr, 'GetMovieColorTable',
     (Movie, 'theMovie', InMode),
     (CTabHandle, 'ctab', OutMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'FlattenMovie',
     (Movie, 'theMovie', InMode),
@@ -544,7 +1252,7 @@ f = Method(void, 'FlattenMovie',
     (short, 'resId', OutMode),
     (ConstStr255Param, 'resName', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(Movie, 'FlattenMovieData',
     (Movie, 'theMovie', InMode),
@@ -554,7 +1262,7 @@ f = Method(Movie, 'FlattenMovieData',
     (ScriptCode, 'scriptTag', InMode),
     (long, 'createMovieFileFlags', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Function(HandlerError, 'GetVideoMediaGraphicsMode',
     (MediaHandler, 'mh', InMode),
@@ -582,53 +1290,6 @@ f = Function(HandlerError, 'SetSoundMediaBalance',
 )
 functions.append(f)
 
-f = Function(ComponentResult, 'AddTextSample',
-    (MediaHandler, 'mh', InMode),
-    (Ptr, 'text', InMode),
-    (unsigned_long, 'size', InMode),
-    (short, 'fontNumber', InMode),
-    (short, 'fontSize', InMode),
-    (short, 'textFace', InMode),
-    (RGBColor, 'textColor', OutMode),
-    (RGBColor, 'backColor', OutMode),
-    (short, 'textJustification', InMode),
-    (Rect, 'textBox', OutMode),
-    (long, 'displayFlags', InMode),
-    (TimeValue, 'scrollDelay', InMode),
-    (short, 'hiliteStart', InMode),
-    (short, 'hiliteEnd', InMode),
-    (RGBColor, 'rgbHiliteColor', OutMode),
-    (TimeValue, 'duration', InMode),
-    (TimeValue, 'sampleTime', OutMode),
-)
-functions.append(f)
-
-f = Function(ComponentResult, 'AddTESample',
-    (MediaHandler, 'mh', InMode),
-    (TEHandle, 'hTE', InMode),
-    (RGBColor, 'backColor', OutMode),
-    (short, 'textJustification', InMode),
-    (Rect, 'textBox', OutMode),
-    (long, 'displayFlags', InMode),
-    (TimeValue, 'scrollDelay', InMode),
-    (short, 'hiliteStart', InMode),
-    (short, 'hiliteEnd', InMode),
-    (RGBColor, 'rgbHiliteColor', OutMode),
-    (TimeValue, 'duration', InMode),
-    (TimeValue, 'sampleTime', OutMode),
-)
-functions.append(f)
-
-f = Function(ComponentResult, 'AddHiliteSample',
-    (MediaHandler, 'mh', InMode),
-    (short, 'hiliteStart', InMode),
-    (short, 'hiliteEnd', InMode),
-    (RGBColor, 'rgbHiliteColor', OutMode),
-    (TimeValue, 'duration', InMode),
-    (TimeValue, 'sampleTime', OutMode),
-)
-functions.append(f)
-
 f = Function(ComponentResult, 'FindNextText',
     (MediaHandler, 'mh', InMode),
     (Ptr, 'text', InMode),
@@ -641,77 +1302,146 @@ f = Function(ComponentResult, 'FindNextText',
 )
 functions.append(f)
 
-f = Function(ComponentResult, 'HiliteTextSample',
-    (MediaHandler, 'mh', InMode),
-    (TimeValue, 'sampleTime', InMode),
-    (short, 'hiliteStart', InMode),
-    (short, 'hiliteEnd', InMode),
-    (RGBColor, 'rgbHiliteColor', OutMode),
-)
-functions.append(f)
-
-f = Function(ComponentResult, 'SetTextSampleData',
-    (MediaHandler, 'mh', InMode),
-    (void, 'data', OutMode),
-    (OSType, 'dataType', InMode),
+f = Method(OSErr, 'MovieSearchText',
+    (Movie, 'theMovie', InMode),
+    (Ptr, 'text', InMode),
+    (long, 'size', InMode),
+    (long, 'searchFlags', InMode),
+    (Track, 'searchTrack', OutMode),
+    (TimeValue, 'searchTime', OutMode),
+    (long, 'searchOffset', OutMode),
 )
-functions.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'GetPosterBox',
     (Movie, 'theMovie', InMode),
     (Rect, 'boxRect', OutMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(void, 'SetPosterBox',
     (Movie, 'theMovie', InMode),
     (Rect_ptr, 'boxRect', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Method(RgnHandle, 'GetMovieSegmentDisplayBoundsRgn',
     (Movie, 'theMovie', InMode),
     (TimeValue, 'time', InMode),
     (TimeValue, 'duration', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
+
+f = Method(RgnHandle, 'GetTrackSegmentDisplayBoundsRgn',
+    (Track, 'theTrack', InMode),
+    (TimeValue, 'time', InMode),
+    (TimeValue, 'duration', InMode),
+)
+Track_methods.append(f)
+
+f = Method(ComponentResult, 'GetTrackStatus',
+    (Track, 'theTrack', InMode),
+)
+Track_methods.append(f)
+
+f = Method(ComponentResult, 'GetMovieStatus',
+    (Movie, 'theMovie', InMode),
+    (Track, 'firstProblemTrack', OutMode),
+)
+Movie_methods.append(f)
 
 f = Method(ComponentInstance, 'NewMovieController',
     (Movie, 'theMovie', InMode),
     (Rect_ptr, 'movieRect', InMode),
     (long, 'someFlags', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Function(void, 'DisposeMovieController',
     (ComponentInstance, 'mc', InMode),
 )
 functions.append(f)
 
-f = Method(void, 'ShowMovieInformation',
-    (Movie, 'theMovie', InMode),
-    (ModalFilterUPP, 'filterProc', InMode),
-    (long, 'refCon', InMode),
-)
-methods.append(f)
-
 f = Method(OSErr, 'PutMovieOnScrap',
     (Movie, 'theMovie', InMode),
     (long, 'movieScrapFlags', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
 
 f = Function(Movie, 'NewMovieFromScrap',
     (long, 'newMovieFlags', InMode),
 )
 functions.append(f)
 
+f = Method(OSErr, 'GetMediaDataRef',
+    (Media, 'theMedia', InMode),
+    (short, 'index', InMode),
+    (Handle, 'dataRef', OutMode),
+    (OSType, 'dataRefType', OutMode),
+    (long, 'dataRefAttributes', OutMode),
+)
+Media_methods.append(f)
+
+f = Method(OSErr, 'SetMediaDataRef',
+    (Media, 'theMedia', InMode),
+    (short, 'index', InMode),
+    (Handle, 'dataRef', InMode),
+    (OSType, 'dataRefType', InMode),
+)
+Media_methods.append(f)
+
+f = Method(OSErr, 'SetMediaDataRefAttributes',
+    (Media, 'theMedia', InMode),
+    (short, 'index', InMode),
+    (long, 'dataRefAttributes', InMode),
+)
+Media_methods.append(f)
+
+f = Method(OSErr, 'AddMediaDataRef',
+    (Media, 'theMedia', InMode),
+    (short, 'index', OutMode),
+    (Handle, 'dataRef', InMode),
+    (OSType, 'dataRefType', InMode),
+)
+Media_methods.append(f)
+
+f = Method(OSErr, 'GetMediaDataRefCount',
+    (Media, 'theMedia', InMode),
+    (short, 'count', OutMode),
+)
+Media_methods.append(f)
+
 f = Method(void, 'SetMoviePlayHints',
     (Movie, 'theMovie', InMode),
     (long, 'flags', InMode),
     (long, 'flagsMask', InMode),
 )
-methods.append(f)
+Movie_methods.append(f)
+
+f = Method(void, 'SetMediaPlayHints',
+    (Media, 'theMedia', InMode),
+    (long, 'flags', InMode),
+    (long, 'flagsMask', InMode),
+)
+Media_methods.append(f)
+
+f = Method(void, 'SetTrackLoadSettings',
+    (Track, 'theTrack', InMode),
+    (TimeValue, 'preloadTime', InMode),
+    (TimeValue, 'preloadDuration', InMode),
+    (long, 'preloadFlags', InMode),
+    (long, 'defaultHints', InMode),
+)
+Track_methods.append(f)
+
+f = Method(void, 'GetTrackLoadSettings',
+    (Track, 'theTrack', InMode),
+    (TimeValue, 'preloadTime', OutMode),
+    (TimeValue, 'preloadDuration', OutMode),
+    (long, 'preloadFlags', OutMode),
+    (long, 'defaultHints', OutMode),
+)
+Track_methods.append(f)
 
 f = Function(ComponentResult, 'MCSetMovie',
     (MovieController, 'mc', InMode),
@@ -738,13 +1468,6 @@ f = Function(ComponentResult, 'MCIsPlayerEvent',
 )
 functions.append(f)
 
-f = Function(ComponentResult, 'MCDoAction',
-    (MovieController, 'mc', InMode),
-    (short, 'action', InMode),
-    (void, 'params', OutMode),
-)
-functions.append(f)
-
 f = Function(ComponentResult, 'MCSetControllerAttached',
     (MovieController, 'mc', InMode),
     (Boolean, 'attach', InMode),
@@ -937,13 +1660,51 @@ f = Function(ComponentResult, 'MCGetMenuString',
 )
 functions.append(f)
 
-f = Function(OSErr, 'QueueSyncTask',
-    (QTSyncTaskPtr, 'task', InMode),
+f = Function(TimeBase, 'NewTimeBase',
 )
 functions.append(f)
 
-f = Function(OSErr, 'DequeueSyncTask',
-    (QTSyncTaskPtr, 'qElem', InMode),
+f = Method(void, 'SetTimeBaseValue',
+    (TimeBase, 'tb', InMode),
+    (TimeValue, 't', InMode),
+    (TimeScale, 's', InMode),
 )
-functions.append(f)
+TimeBase_methods.append(f)
+
+f = Method(Fixed, 'GetTimeBaseRate',
+    (TimeBase, 'tb', InMode),
+)
+TimeBase_methods.append(f)
+
+f = Method(void, 'SetTimeBaseRate',
+    (TimeBase, 'tb', InMode),
+    (Fixed, 'r', InMode),
+)
+TimeBase_methods.append(f)
+
+f = Method(long, 'GetTimeBaseFlags',
+    (TimeBase, 'tb', InMode),
+)
+TimeBase_methods.append(f)
+
+f = Method(void, 'SetTimeBaseFlags',
+    (TimeBase, 'tb', InMode),
+    (long, 'timeBaseFlags', InMode),
+)
+TimeBase_methods.append(f)
+
+f = Method(TimeBase, 'GetTimeBaseMasterTimeBase',
+    (TimeBase, 'tb', InMode),
+)
+TimeBase_methods.append(f)
+
+f = Method(ComponentInstance, 'GetTimeBaseMasterClock',
+    (TimeBase, 'tb', InMode),
+)
+TimeBase_methods.append(f)
+
+f = Method(Fixed, 'GetTimeBaseEffectiveRate',
+    (TimeBase, 'tb', InMode),
+)
+TimeBase_methods.append(f)
 

Mac/Modules/qt/qtscan.py

@@ -6,7 +6,7 @@ from scantools import Scanner
 
 LONG = "QuickTime"
 SHORT = "qt"
-OBJECT = "Movie"
+OBJECTS = ("Movie", "Track", "Media", "UserData", "TimeBase")
 
 def main():
 	input = "Movies.h"
@@ -26,52 +26,75 @@ class MyScanner(Scanner):
 		listname = "functions"
 		if arglist:
 			t, n, m = arglist[0]
-			if t == OBJECT and m == "InMode":
+			if t in OBJECTS and m == "InMode":
 				classname = "Method"
-				listname = "methods"
+				listname = t + "_methods"
 		return classname, listname
 
 	def makeblacklistnames(self):
 		return [
 			"DisposeMovie",		# Done on python-object disposal
+			"DisposeMovieTrack",	# ditto
+			"DisposeTrackMedia",	# ditto
+			"DisposeUserData",		# ditto
+			"DisposeTimeBase",		# ditto
 			"GetMovieCreationTime",	# type "unsigned long" in C, inparseable
 			"GetMovieModificationTime",	# Ditto
+			"GetTrackCreationTime",		# ditto
+			"GetTrackModificationTime",	# Ditto
+			"GetMediaCreationTime",		# ditto
+			"GetMediaModificationTime",	# Ditto
+			# The following 4 use 'void *' in an uncontrolled way
+			# TBD when I've read the manual...
+			"GetUserDataItem",
+			"SetUserDataItem",
+			"SetTextSampleData",
+			"MCDoAction",
+			# bgen gets the argument in/out wrong..
+			"AddTextSample",
+			"AddTESample",
+			"AddHiliteSample",
+			"HiliteTextSample",
 			]
 
 	def makeblacklisttypes(self):
 		return [
-			"MoviesErrorUPP",
-			"Track",	# XXXX To be done in the future
-			"Media",
-			"UserData",
-			"TimeBase",
+			# I don't think we want to do these
+			"QTSyncTaskPtr",
+			# We dont do callbacks yet, so no need for these
 			"QTCallBack",
-			"Component",
+			# Skipped for now, due to laziness
 			"TimeRecord",
 			"TimeRecord_ptr",
 			"TrackEditState",
 			"MovieEditState",
-			"MoviePreviewCallOutUPP",
+			"MatrixRecord",
+			"MatrixRecord_ptr",
+			"SampleReferencePtr",
+#			"SampleDescription",
+#			"SoundDescription",
+#			"TextDescription",
+#			"MusicDescription",
+			# I dont know yet how to do these.
 			"CGrafPtr",
 			"GDHandle",
+			# Routine pointers, not yet.
+			"MoviesErrorUPP",
+			"MoviePreviewCallOutUPP",
 			"MovieDrawingCompleteUPP",
-			"PixMapHandle",
-			"MatrixRecord",
-			"MatrixRecord_ptr",
 			"QTCallBackUPP",
 			"TextMediaUPP",
 			"MovieProgressUPP",
 			"MovieRgnCoverUPP",
 			"MCActionFilterUPP",
 			"MCActionFilterWithRefConUPP",
-			"SampleDescription",
-			"SoundDescription",
-			"TextDescription",
-			"MusicDescription",
+			"GetMovieUPP",
+			"ModalFilterUPP",
 			]
 
 	def makerepairinstructions(self):
 		return [
+			([('FSSpec', '*', 'OutMode')], [('FSSpec_ptr', '*', 'InMode')]),
 			]
 			
 if __name__ == "__main__":

Mac/Modules/qt/qtsupport.py

@@ -7,7 +7,7 @@ import string
 
 # Declarations that change for each manager
 MACHEADERFILE = 'Movies.h'		# The Apple header file
-MODNAME = 'qt'				# The name of the module
+MODNAME = 'Qt'				# The name of the module
 OBJECTNAME = 'Movie'			# The basic name of the objects used here
 
 # The following is *usually* unchanged but may still require tuning
@@ -23,9 +23,59 @@ from macsupport import *
 
 includestuff = includestuff + """
 #include <%s>""" % MACHEADERFILE + """
+
+/* Exported by Cmmodule.c: */
+extern PyObject *CmpObj_New(Component);
+extern int CmpObj_Convert(PyObject *, Component *);
+extern PyObject *CmpInstObj_New(ComponentInstance);
+extern int CmpInstObj_Convert(PyObject *, ComponentInstance *);
+
+/* Exported by Qdmodule.c: */
+extern PyObject *QdRGB_New(RGBColor *);
+extern int QdRGB_Convert(PyObject *, RGBColor *);
+
+/* Our own, used before defined: */
+staticforward PyObject *TrackObj_New(Track);
+staticforward int TrackObj_Convert(PyObject *, Track *);
+staticforward PyObject *MovieObj_New(Movie);
+staticforward int MovieObj_Convert(PyObject *, Movie *);
+
+
 """
 
-Movie = OpaqueByValueType(OBJECTTYPE, OBJECTPREFIX)
+# Our (opaque) objects
+Movie = OpaqueByValueType('Movie', 'MovieObj')
+Track = OpaqueByValueType('Track', 'TrackObj')
+Media = OpaqueByValueType('Media', 'MediaObj')
+UserData = OpaqueByValueType('UserData', 'UserDataObj')
+TimeBase = OpaqueByValueType('TimeBase', 'TimeBaseObj')
+
+# Other opaque objects
+Component = OpaqueByValueType('Component', 'CmpObj')
+MediaHandlerComponent = OpaqueByValueType('MediaHandlerComponent', 'CmpObj')
+DataHandlerComponent = OpaqueByValueType('DataHandlerComponent', 'CmpObj')
+
+ComponentInstance = OpaqueByValueType('ComponentInstance', 'CmpInstObj')
+MediaHandler = OpaqueByValueType('MediaHandler', 'CmpInstObj')
+DataHandler = OpaqueByValueType('DataHandler', 'CmpInstObj')
+# XXXX The next one should really be a full-fledged object here, but the
+#      type is sometimes specified as MovieController and some times as
+#      ComponentInstance.
+MovieController = OpaqueByValueType('MovieController', 'CmpInstObj')
+
+RgnHandle = OpaqueByValueType("RgnHandle", "ResObj")
+PicHandle = OpaqueByValueType("PicHandle", "ResObj")
+CTabHandle = OpaqueByValueType("CTabHandle", "ResObj")
+PixMapHandle = OpaqueByValueType("PixMapHandle", "ResObj")
+SampleDescriptionHandle = OpaqueByValueType("SampleDescriptionHandle", "ResObj")
+TEHandle = OpaqueByValueType("TEHandle", "ResObj")
+# Silly Apple, passing an OStype by reference...
+OSType_ptr = OpaqueType("OSType", "PyMac_BuildOSType", "PyMac_GetOSType")
+
+RGBColor = OpaqueType("RGBColor", "QdRGB")
+RGBColor_ptr = OpaqueType("RGBColor", "QdRGB")
+
+# Non-opaque types, mostly integer-ish
 TimeValue = Type("TimeValue", "l")
 TimeScale = Type("TimeScale", "l")
 TimeBaseFlags = Type("TimeBaseFlags", "l")
@@ -38,12 +88,13 @@ movieFlattenFlagsEnum = Type("movieFlattenFlagsEnum", "l")
 dataRefAttributesFlags = Type("dataRefAttributesFlags", "l")
 playHintsEnum = Type("playHintsEnum", "l")
 mediaHandlerFlagsEnum = Type("mediaHandlerFlagsEnum", "l")
-
-RgnHandle = OpaqueByValueType("RgnHandle", "ResObj")
-PicHandle = OpaqueByValueType("PicHandle", "ResObj")
+ComponentResult = Type("ComponentResult", "l")
+HandlerError = Type("HandlerError", "l")
+Ptr = InputOnlyType("Ptr", "s")
+StringPtr = InputOnlyType("StringPtr", "s")
 
 
-class MyObjectDefinition(GlobalObjectDefinition):
+class MovieObjectDefinition(GlobalObjectDefinition):
 	def outputCheckNewArg(self):
 		Output("""if (itself == NULL) {
 					PyErr_SetString(Qt_Error,"Cannot create null Movie");
@@ -52,26 +103,79 @@ class MyObjectDefinition(GlobalObjectDefinition):
 	def outputFreeIt(self, itselfname):
 		Output("DisposeMovie(%s);", itselfname)
 
+class TrackObjectDefinition(GlobalObjectDefinition):
+	def outputCheckNewArg(self):
+		Output("""if (itself == NULL) {
+					PyErr_SetString(Qt_Error,"Cannot create null Track");
+					return NULL;
+				}""")
+	def outputFreeIt(self, itselfname):
+		Output("DisposeMovieTrack(%s);", itselfname)
+
+class MediaObjectDefinition(GlobalObjectDefinition):
+	def outputCheckNewArg(self):
+		Output("""if (itself == NULL) {
+					PyErr_SetString(Qt_Error,"Cannot create null Media");
+					return NULL;
+				}""")
+	def outputFreeIt(self, itselfname):
+		Output("DisposeTrackMedia(%s);", itselfname)
+
+class UserDataObjectDefinition(GlobalObjectDefinition):
+	def outputCheckNewArg(self):
+		Output("""if (itself == NULL) {
+					PyErr_SetString(Qt_Error,"Cannot create null UserData");
+					return NULL;
+				}""")
+	def outputFreeIt(self, itselfname):
+		Output("DisposeUserData(%s);", itselfname)
+
+class TimeBaseObjectDefinition(GlobalObjectDefinition):
+	def outputCheckNewArg(self):
+		Output("""if (itself == NULL) {
+					PyErr_SetString(Qt_Error,"Cannot create null TimeBase");
+					return NULL;
+				}""")
+	def outputFreeIt(self, itselfname):
+		Output("DisposeTimeBase(%s);", itselfname)
+
 # From here on it's basically all boiler plate...
 
 # Create the generator groups and link them
 module = MacModule(MODNAME, MODPREFIX, includestuff, finalstuff, initstuff)
-object = MyObjectDefinition(OBJECTNAME, OBJECTPREFIX, OBJECTTYPE)
-module.addobject(object)
+Movie_object = MovieObjectDefinition('Movie', 'MovieObj', 'Movie')
+Track_object = TrackObjectDefinition('Track', 'TrackObj', 'Track')
+Media_object = MediaObjectDefinition('Media', 'MediaObj', 'Media')
+UserData_object = UserDataObjectDefinition('UserData', 'UserDataObj', 'UserData')
+TimeBase_object = TimeBaseObjectDefinition('TimeBase', 'TimeBaseObj', 'TimeBase')
+
+module.addobject(TimeBase_object)
+module.addobject(UserData_object)
+module.addobject(Media_object)
+module.addobject(Track_object)
+module.addobject(Movie_object)
 
 # Create the generator classes used to populate the lists
-Function = FunctionGenerator
-Method = MethodGenerator
+Function = OSErrFunctionGenerator
+Method = OSErrMethodGenerator
 
 # Create and populate the lists
 functions = []
-methods = []
+TimeBase_methods = []
+UserData_methods = []
+Media_methods = []
+Track_methods = []
+Movie_methods = []
 execfile(INPUTFILE)
 
 # add the populated lists to the generator groups
 # (in a different wordl the scan program would generate this)
 for f in functions: module.add(f)
-for f in methods: object.add(f)
+for f in TimeBase_methods: TimeBase_object.add(f)
+for f in UserData_methods: UserData_object.add(f)
+for f in Media_methods: Media_object.add(f)
+for f in Track_methods: Track_object.add(f)
+for f in Movie_methods: Movie_object.add(f)
 
 # generate output (open the output file as late as possible)
 SetOutputFileName(OUTPUTFILE)