Changeset 872

Timestamp:

05/04/08 19:42:27 (4 months ago)

Author:

astrange

Message:

SAMI subtitle importing.
Patch by capri91 (gmail com).

Files:

• trunk/Subtitles/SubContext.h (modified) (1 diff)
• trunk/Subtitles/SubImport.mm (modified) (6 diffs)

trunk/Subtitles/SubContext.h

@@ -10 +10 @@
-#import "SubRenderer.h"
-
-
+, kSubTypeSMI
-enum {kSubCollisionsNormal, kSubCollisionsReverse};
-enum {kSubLineWrapTopWider = 0, kSubLineWrapSimple, kSubLineWrapNone, kSubLineWrapBottomWider};

trunk/Subtitles/SubImport.mm

@@ -10 +10 @@
-#include "CommonUtils.h"
-#include "Codecprintf.h"
+#include "CodecIDs.h"
-#import "SubImport.h"
-#import "SubParsing.h"
@@ -161 +162 @@
-        return [nssSub substringToIndex:[nssSub rangeOfString:@"[Events]" options:NSLiteralSearch].location];
-}
+
+#pragma mark SAMI Parsing
-
-static void LoadSRTFromPath(NSString *path, SubSerializer *ss)
@@ -216 +219 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
@@ -237 +524 @@
-                {
-                        timeBase = 100;
-'SSA '
+kSubFormatSSA
-                        const char *cheader = [LoadSSAFromPath(nsPath, ss) UTF8String];
-                        int headerLen = strlen(cheader);
@@ -245 +532 @@
-                case kSubTypeSRT:
-                        timeBase = 1000;
-'SRT '
+kSubFormatUTF8
-                        LoadSRTFromPath(nsPath, ss);
+                        break;
+                case kSubTypeSMI:
+                        timeBase = 1000;
+                        subCodec = kSubFormatUTF8;
+                        LoadSMIFromPath(nsPath, ss, whichTrack);
-                        break;
-        }
@@ -418 +710 @@
-                                                if (actRange.length && actRange.location == extRange.location)
-                                                        err = LoadVobSubSubtitles(&parentDir, cfFoundFilename, theMovie, &firstSubTrack);
+                                                else {
+                                                        actRange = CFStringFind(cfFoundFilename, CFSTR(".smi"), kCFCompareCaseInsensitive | kCFCompareBackwards);
+                                                        if (actRange.length && actRange.location == extRange.location)
+                                                                subType = kSubTypeSMI;
+                                                }
-                                        }
-                                }
-                        }
-                        
-
-
+
+
+
+
+
+
+
-                        if (err) goto bail;
-                }