Changeset 658

Timestamp:

02/26/07 15:36:48 (3 years ago)

Author:

vasi

Message:

grr frustration

Location:

QTSplit

Files:

• AGRegex/pcre-build.sh (modified) (1 diff)
• AppDelegate.m (modified) (1 diff)
• QTChapter.m (modified) (2 diffs)
• QTExporter.m (modified) (1 diff)
• QTKit+Extensions.h (modified) (1 diff)
• QTKit+Extensions.m (modified) (2 diffs)

QTSplit/AGRegex/pcre-build.sh

@@ -28 +28 @@
 /usr/bin/install_name_tool -id "@executable_path/../Libraries/libpcre.dylib" \
     "${built}"
+mkdir -p "`dirname ${lib}`"
 ln -f "${built}" "${lib}"

QTSplit/AppDelegate.m

@@ -72 +72 @@
         NSLog(@"Saving chapter %d in '%@'", i + 1, dst);
         
-        QTExporter *exporter = [QTExporterM4A exporterWithMovie: ext];
-        [exporter exportToFile: dst];
+//        QTExporter *exporter = [QTExporterM4A exporterWithMovie: ext];
+//        [exporter exportToFile: dst];
     }
 }

QTSplit/QTChapter.m

@@ -71 +71 @@
 - (QTMovie*) extractWithRange: (QTTimeRange)range {
         QTMovie *mov = [[self movie] extract: range];
-        
+
+        [mov setEditable: YES];
+    
         // Don't keep artwork, text, etc from margins   
         NSEnumerator *en = [[self chapterSpecificTracks] objectEnumerator];
@@ -87 +89 @@
         // Get rid of chapter track
         [[mov chapterTrack] removeFromMovie];
-        
+        [mov setEditable: NO];
+    
     // Add meta-data to indicate title
     [mov setMetaData: [self name] forTag: QTMetaDataName];

QTSplit/QTExporter.m

@@ -68 +68 @@
 }
 
++ (NSString*) mktemp: (NSString*)file ext: (NSString*)ext {
+    NSString *tempfile = nil;
+    char *ctmpl = NULL;
+    
+    NSString *template = [[NSTemporaryDirectory()
+        stringByAppendingPathComponent: file]
+        stringByAppendingPathExtension: ext];
+    unsigned len = [template maximumLengthOfBytesUsingEncoding:
+        NSUTF8StringEncoding];
+    ctmpl = malloc(len + 1);
+    BOOL ok = [template getCString: ctmpl maxLength: len
+        encoding: NSUTF8StringEncoding];
+    if (!ok) goto done;
+    
+    char *ctmpfile = mktemp(ctmpl);
+    tempfile = [NSString stringWithUTF8String: ctmpfile];
+    
+done:
+    if (ctmpl) free(ctmpl);
+    return tempfile;
+}
+
 - (void) exportToFile: (NSString*)path {
+    NSFileManager *fm = [NSFileManager defaultManager];
+    BOOL isDir;
+    BOOL exists = [fm fileExistsAtPath: path isDirectory: &isDir];
+    if (exists && isDir) [NSException raise: QTExporterExportException
+        format: @"Directory is in the way of movie export"];
+    
     /* QuickTime can sometimes be sensitive to file names, so export to a
      * safe path and then move to the desired location */
-    char template[] = "QTExporterXXXXXXXXX";
-    char *tmpfile = mktemp(template);
-    NSString *safe = tmpfile ? [NSString stringWithUTF8String: tmpfile] : path;
-    
-        NSDictionary *attrs = [NSDictionary dictionaryWithObjectsAndKeys:
-                [NSNumber numberWithBool: YES],         QTMovieExport,
-                [NSNumber numberWithLong: stype],       QTMovieExportType,
-                [NSNumber numberWithLong: manu],        QTMovieExportManufacturer,
-                [settings asData],                                      QTMovieExportSettings,
-                nil];
-        BOOL success = [movie writeToFile: safe withAttributes: attrs];
-        if (!success) [NSException raise: QTExporterExportException
-                                                          format: @"Movie export failed"];
+    NSString *safe = [[self class] mktemp: @".QTExporterXXXXXXXXXXX"
+        ext: [path pathExtension]];
+    if (!safe) safe = path;
+    
+    NSDictionary *attrs = [NSDictionary dictionaryWithObjectsAndKeys:
+        [NSNumber numberWithBool: YES],         QTMovieExport,
+        [NSNumber numberWithLong: stype],       QTMovieExportType,
+        [NSNumber numberWithLong: manu],        QTMovieExportManufacturer,
+        [settings asData],                                      QTMovieExportSettings,
+        nil];
+    BOOL success = [movie writeToFile: safe withAttributes: attrs];
+    if (!success) [NSException raise: QTExporterExportException
+                              format: @"Movie export failed"];
     
     if (![safe isEqual: path]) {
-        NSFileManager *fm = [NSFileManager defaultManager];
+        if ([fm fileExistsAtPath: path])
+            [fm removeFileAtPath: path handler: nil];
         if (![fm movePath: safe toPath: path handler: nil]) {
+            [fm removeFileAtPath: safe handler: nil];
             [NSException raise: QTExporterExportException
                 format: @"Can't move exported movie into place"];

QTSplit/QTKit+Extensions.h

@@ -46 +46 @@
 
 // Editing movies
+@interface QTMovie (EditingHidden) // Methods exist but silly Apple hides them
+- (void) setEditable: (BOOL)ed;
+@end
+
 @interface QTMovie (Editing)
 - (QTMovie*) extract: (QTTimeRange)range;

QTSplit/QTKit+Extensions.m

@@ -141 +141 @@
 @end
 
-
+#import <objc/objc-class.h>
 
 @implementation QTMovie (Editing)
@@ -147 +147 @@
         range = QTWorkingIntersection(range, [self timeRange]);
         QTMovie *dst = [QTMovie movie];
-        [dst setAttribute: [NSNumber numberWithBool: TRUE]
-                           forKey: QTMovieEditableAttribute];
+printf("%s\n", dst->isa->name);
+    
+    [dst setEditable: YES];
         [dst insertSegmentOfMovie: self timeRange: range
                                            atTime: [dst startTime]];
+        [dst setEditable: NO];
         return dst;
 }