minor code cleanups
authorRob Haarsma <phaseIV@zonnet.nl>
Fri, 9 May 2003 12:45:59 +0000 (12:45 +0000)
committerRob Haarsma <phaseIV@zonnet.nl>
Fri, 9 May 2003 12:45:59 +0000 (12:45 +0000)
source/blender/quicktime/apple/quicktime_export.c
source/blender/quicktime/apple/quicktime_import.c

index 29734ae13da85f37c16d6b9860397a047fcd20c1..c96836b7394ececf94b58c4392c0de25246c0e2f 100644 (file)
@@ -361,7 +361,6 @@ static void QT_DoAddVideoSamplesToMedia (int frame)
 
 static void QT_EndAddVideoSamplesToMedia (void)
 {
-       
        SCCompressSequenceEnd(qcdx->theComponent);
 
        UnlockPixels(qte->thePixMap);
@@ -568,16 +567,15 @@ static void check_renderbutton_framerate(void) {
 int get_qtcodec_settings(void) 
 {
        OSErr   err = noErr;
-       Component c = 0;
-       ComponentDescription cd;
+//     Component c = 0;
+//     ComponentDescription cd;
        CodecInfo ci;
 
-       cd.componentType = StandardCompressionType;
-       cd.componentSubType = StandardCompressionSubType;
-       cd.componentManufacturer = 0;
-       cd.componentFlags = 0;
-       cd.componentFlagsMask = 0;
-
+//     cd.componentType = StandardCompressionType;
+//     cd.componentSubType = StandardCompressionSubType;
+//     cd.componentManufacturer = 0;
+//     cd.componentFlags = 0;
+//     cd.componentFlagsMask = 0;
 
        if(qcdx == NULL) {
                qcdx = MEM_callocN(sizeof(QuicktimeCodecDataExt), "QuicktimeCodecDataExt");
@@ -587,9 +585,9 @@ int get_qtcodec_settings(void)
        // configure the standard image compression dialog box
 
        if (qcdx->theComponent == NULL) {
-//             qcdx->theComponent = OpenDefaultComponent(StandardCompressionType, StandardCompressionSubType);
-               c = FindNextComponent(c, &cd);
-               qcdx->theComponent = OpenComponent(c);
+               qcdx->theComponent = OpenDefaultComponent(StandardCompressionType, StandardCompressionSubType);
+//             c = FindNextComponent(c, &cd);
+//             qcdx->theComponent = OpenComponent(c);
 
 //             qcdx->gSpatialSettings.codecType = nil;     
                qcdx->gSpatialSettings.codec = anyCodec;         
@@ -619,9 +617,8 @@ int get_qtcodec_settings(void)
        // put up the dialog box
 
        err = SCRequestSequenceSettings(qcdx->theComponent);
-
  
-   if (err == scUserCancelled) {
+       if (err == scUserCancelled) {
                G.afbreek = 1;
                return 0;
        }
index c961472318b5f4318170f6dae91a5d1f3786c096..798893a053ea5cd454acb2e0cfef644e870b9cb5 100644 (file)
@@ -489,7 +489,7 @@ ImBuf  *imb_quicktime_decode(unsigned char *mem, int size, int flags)
        (**dataref).data = mem;
        (**dataref).dataLength = size;
 
-       err = OpenADataHandler(dataref,
+       err = OpenADataHandler((Handle)dataref,
                                                        PointerDataHandlerSubType,
                                                        nil,
                                                        (OSType)0,
@@ -501,7 +501,7 @@ ImBuf  *imb_quicktime_decode(unsigned char *mem, int size, int flags)
                goto bail;
        }
 
-       err = GetGraphicsImporterForDataRef(dataref, PointerDataHandlerSubType, &gImporter);
+       err = GetGraphicsImporterForDataRef((Handle)dataref, PointerDataHandlerSubType, &gImporter);
        if (err != noErr) {
                if(QTIME_DEBUG) printf("no graphimport\n");
                goto bail;