Changeset 768

Timestamp:

01/15/08 16:48:55 (1 year ago)

Author:

astrange

Message:

QT 7.4 doesn't call MovieImportFile?, breaking subtitle import completely. Fix it. (WTF????)

Files:

• branches/perian-1.1/MatroskaImport.cpp (modified) (3 diffs)
• branches/perian-1.1/Subtitles/SubImport.h (modified) (1 diff)
• branches/perian-1.1/Subtitles/SubImport.mm (modified) (1 diff)
• branches/perian-1.1/ff_MovieImport.c (modified) (3 diffs)

branches/perian-1.1/MatroskaImport.cpp

@@ -116 +116 @@
-        err = store->ImportDataRef((Handle)alias, rAliasType, theMovie, targetTrack,
-                                                           usedTrack, atTime, durationAdded, inFlags, outFlags);
-
-
-
-
+
-bail:
-        if (alias)
@@ -131 +128 @@
-                                                                          Track *usedTrack, TimeValue atTime, TimeValue *durationAdded, long inFlags, long *outFlags)
-{
-return
+ComponentResult res =
-                                                                usedTrack, atTime, durationAdded, inFlags, outFlags);
+        
+        LoadExternalSubtitlesFromFileDataRef(dataRef, dataRefType, theMovie);
+        return res;
-}
-
@@ -254 +254 @@
-                        // invalid file, validate should catch this
-                        return invalidMovie;
-
+               
-                err = SetupMovie();
-                if (err) return err;

branches/perian-1.1/Subtitles/SubImport.h

@@ -25 +25 @@
-short GetFilenameLanguage(CFStringRef filename);
-ComponentResult LoadExternalSubtitles(const FSRef *theFile, Movie theMovie);
+ComponentResult LoadExternalSubtitlesFromFileDataRef(Handle dataRef, OSType dataRefType, Movie theMovie);
-Track CreatePlaintextSubTrack(Movie theMovie, ImageDescriptionHandle imgDesc, TimeScale timescale, Handle dataRef, OSType dataRefType, FourCharCode subType, Handle imageExtension, Rect movieBox);
-

branches/perian-1.1/Subtitles/SubImport.mm

@@ -444 +444 @@
-}
-
+ComponentResult LoadExternalSubtitlesFromFileDataRef(Handle dataRef, OSType dataRefType, Movie theMovie)
+{
+        if (dataRefType != AliasDataHandlerSubType) {
+                FourCharCode type = EndianU32_NtoB(dataRefType);
+                Codecprintf(NULL, "importing dataRef of type \"%.4s\"", &type);
+                return noErr;
+        }
+        
+        CFStringRef cfPath;
+        FSRef ref;
+        uint8_t path[PATH_MAX];
+        
+        QTGetDataReferenceFullPathCFString(dataRef, dataRefType, kQTPOSIXPathStyle, &cfPath);
+        CFStringGetCString(cfPath, (char*)path, PATH_MAX, kCFStringEncodingUTF8);
+        FSPathMakeRef(path, &ref, NULL);
+        CFRelease(cfPath);
+        
+        return LoadExternalSubtitles(&ref, theMovie);
+}
+
-#pragma mark Obj-C Classes
-

branches/perian-1.1/ff_MovieImport.c

@@ -405 +405 @@
-        result = FSpMakeFSRef(theFile, &theFileFSRef);
-        require_noerr(result, bail);
-
-
-
+
-bail:
-                if(dataRef)
@@ -434 +432 @@
-        if(valid != 255)
-                goto bail;
-
+       
-        /* Prepare the iocontext structure */
-        result = url_open_dataref(&byteContext, dataRef, dataRefType, &storage->dataHandler, &storage->dataHandlerSupportsWideOffsets, &storage->dataSize);
@@ -548 +546 @@
-        }
-        
+        LoadExternalSubtitlesFromFileDataRef(dataRef, dataRefType, theMovie);
+
-bail:
-        if(result == noErr)