Changeset 1101

Timestamp:

07/10/09 13:15:47 (8 months ago)

Author:

astrange

Message:

Merge trunk to release branch.

Files:

• branches/perian-1.1 (modified) (1 prop)
• branches/perian-1.1/CPFPerianPrefPaneController.m (modified) (1 diff)
• branches/perian-1.1/Perian.xcodeproj/project.pbxproj (modified) (48 diffs)
• branches/perian-1.1/Prefix.h (copied) (copied from trunk/Prefix.h)
• branches/perian-1.1/Release/Changes.txt (modified) (1 diff)
• branches/perian-1.1/Subtitles/SubATSUIRenderer.h (modified) (1 diff)
• branches/perian-1.1/Subtitles/SubATSUIRenderer.m (modified) (16 diffs)
• branches/perian-1.1/UniversalDetector/UniversalDetector.h (modified) (1 diff)
• branches/perian-1.1/UniversalDetector/UniversalDetector.xcodeproj/project.pbxproj (modified) (7 diffs)
• branches/perian-1.1/createStaticLibs.sh (modified) (1 diff)

branches/perian-1.1/CPFPerianPrefPaneController.m

@@ -382 +382 @@
-                BOOL isDir = NO;
-                NSString *tempPrefPane = [NSTemporaryDirectory() stringByAppendingPathComponent:@"PerianPane.prefPane"];
+        
+                //10.4 doesn't have NSInteger, but 64-bit requires it
+#ifdef __LP64__
+                NSInteger tag;
+#else
-                int tag;
+#endif
-                
-                if([[NSFileManager defaultManager] fileExistsAtPath:tempPrefPane isDirectory:&isDir] && isDir)

branches/perian-1.1/Perian.xcodeproj/project.pbxproj

@@ -114 +114 @@
-                11C85FE60A64314500DF3D73 /* FFusionCodec.r in Rez */ = {isa = PBXBuildFile; fileRef = F560DF0203D622D001ABA332 /* FFusionCodec.r */; };
-                11F28DAD0B52EB75000AF78C /* SUUpdateAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F28DAC0B52EB75000AF78C /* SUUpdateAlert.m */; };
+                3D0A03BD100692E20087E580 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 11629EEA0B51E4F1006591C8 /* Cocoa.framework */; };
+                3D0A03BE100692E30087E580 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 11D4EEFC0A3CE7FA0066D45F /* Carbon.framework */; };
-                3D211A1D0B6B18880051299D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F539CD110B62BC82005A72C9 /* Foundation.framework */; };
-                3D211A200B6B1A540051299D /* SubContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D211A1F0B6B1A540051299D /* SubContext.m */; };
@@ -543 +545 @@
-                11F28DAB0B52EB75000AF78C /* SUUpdateAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUUpdateAlert.h; sourceTree = "<group>"; };
-                11F28DAC0B52EB75000AF78C /* SUUpdateAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUUpdateAlert.m; sourceTree = "<group>"; };
+                3D0A039710068CAF0087E580 /* Prefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.h; sourceTree = "<group>"; };
-                3D211A1E0B6B1A540051299D /* SubContext.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SubContext.h; path = Subtitles/SubContext.h; sourceTree = "<group>"; };
-                3D211A1F0B6B1A540051299D /* SubContext.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = SubContext.m; path = Subtitles/SubContext.m; sourceTree = "<group>"; };
@@ -827 +830 @@
-                                F57755F50B51EB1800C7D833 /* CoreFoundation.framework in Frameworks */,
-                                3D95B9010E208965007C8F51 /* libbz2.dylib in Frameworks */,
+                                3D0A03BD100692E20087E580 /* Cocoa.framework in Frameworks */,
+                                3D0A03BE100692E30087E580 /* Carbon.framework in Frameworks */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -920 +925 @@
-                                61D517720AE0402E00A671E1 /* CommonUtils.c */,
-                                6116E74E0B4738CE0020F1CE /* CodecIDs.h */,
+                                3D0A039710068CAF0087E580 /* Prefix.h */,
-                        );
-                        indentWidth = 4;
@@ -1982 +1988 @@
-                        isa = XCBuildConfiguration;
-                        buildSettings = {
-                                COPY_PHASE_STRIP = NO;
-                                GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                                GCC_MODEL_TUNING = G5;
-                                GCC_OPTIMIZATION_LEVEL = 0;
-                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                                GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-                                GCC_VERSION = 4.0;
-                                INFOPLIST_FILE = "Plists/PerianUpdateChecker-Info.plist";
-                                INSTALL_PATH = "$(HOME)/Applications";
-                                OTHER_LDFLAGS = (
-                                        "-framework",
-                                        Foundation,
-                                        "-framework",
-                                        AppKit,
-                                );
-                                PREBINDING = NO;
-                                PRODUCT_NAME = PerianUpdateChecker;
-                                WRAPPER_EXTENSION = app;
@@ -2007 +2002 @@
-                        isa = XCBuildConfiguration;
-                        buildSettings = {
-                                COPY_PHASE_STRIP = YES;
-                                GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                                GCC_MODEL_TUNING = G5;
-                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                                GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-                                GCC_VERSION = 4.0;
-                                INFOPLIST_FILE = "Plists/PerianUpdateChecker-Info.plist";
-                                INSTALL_PATH = "$(HOME)/Applications";
-                                OTHER_LDFLAGS = (
-                                        "-framework",
-                                        Foundation,
-                                        "-framework",
-                                        AppKit,
-                                );
-                                PREBINDING = NO;
-                                PRODUCT_NAME = PerianUpdateChecker;
-                                WRAPPER_EXTENSION = app;
@@ -2031 +2015 @@
-                        isa = XCBuildConfiguration;
-                        buildSettings = {
-                                COPY_PHASE_STRIP = NO;
-                                DEAD_CODE_STRIPPING = NO;
-                                EXPORTED_SYMBOLS_FILE = "$(SOURCE_ROOT)/exportedSymbols";
+                                GCC_ALTIVEC_EXTENSIONS = YES;
-                                GCC_ENABLE_OBJC_GC = supported;
-                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                                GCC_MODEL_TUNING = G5;
-                                GCC_OPTIMIZATION_LEVEL = 0;
-                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                                GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
-                                GCC_VERSION = 4.0;
-                                "GCC_VERSION[arch=*]" = "";
@@ -2053 +2033 @@
-                                INSTALL_PATH = "$(HOME)/Library/QuickTime";
-                                OTHER_LDFLAGS = (
-                                        "-framework",
-                                        Carbon,
-                                        "-read_only_relocs",
-                                        suppress,
@@ -2069 +2047 @@
-                        isa = XCBuildConfiguration;
-                        buildSettings = {
-                                DEAD_CODE_STRIPPING = YES;
-                                EXPORTED_SYMBOLS_FILE = "$(SOURCE_ROOT)/exportedSymbols";
-                                GCC_ALTIVEC_EXTENSIONS = YES;
-                                GCC_ENABLE_OBJC_GC = supported;
-                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                                GCC_MODEL_TUNING = G5;
-                                GCC_OPTIMIZATION_LEVEL = 3;
-                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                                GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
-                                GCC_VERSION = 4.0;
-                                "GCC_VERSION[arch=*]" = "";
@@ -2091 +2065 @@
-                                INFOPLIST_PREPROCESS = YES;
-                                INSTALL_PATH = "$(HOME)/Library/QuickTime";
-
-
-
+
+
+
+
-                                OTHER_REZFLAGS = "-rd -d ppc_$(ppc) -d i386_$(i386) -d TARGET_REZ_CARBON_MACHO=1";
-                                PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
-                                PRODUCT_NAME = Perian;
-                                WARNING_CFLAGS = "-Wimplicit";
@@ -2119 +2093 @@
-                        isa = XCBuildConfiguration;
-                        buildSettings = {
+                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-                                DEAD_CODE_STRIPPING = YES;
-                                DEBUG_INFORMATION_FORMAT = dwarf;
-                                GCC_ALTIVEC_EXTENSIONS = YES;
-                                GCC_DYNAMIC_NO_PIC = YES;
+                                GCC_INCREASE_PRECOMPILED_HEADER_SHARING = YES;
-                                GCC_MODEL_TUNING = G5;
+                                GCC_PREFIX_HEADER = Prefix.h;
-                                GCC_PREPROCESSOR_DEFINITIONS = DEBUG_BUILD;
+                                GCC_STRICT_ALIASING = YES;
-                                HEADER_SEARCH_PATHS = (
-                                        libmatroska,
@@ -2132 +2110 @@
-                                );
-                                LIBRARY_SEARCH_PATHS = $SYMROOT/Universal;
-
-
-
-
+
-                                PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
+                                SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
-                                SDKROOT = macosx10.4;
-                        };
@@ -2144 +2120 @@
-                        isa = XCBuildConfiguration;
-                        buildSettings = {
-
-
-
-
+
-                                DEAD_CODE_STRIPPING = YES;
-                                DEBUG_INFORMATION_FORMAT = dwarf;
+                                GCC_ALTIVEC_EXTENSIONS = YES;
-                                GCC_DYNAMIC_NO_PIC = YES;
+                                GCC_INCREASE_PRECOMPILED_HEADER_SHARING = YES;
-                                GCC_MODEL_TUNING = G5;
+                                GCC_PREFIX_HEADER = Prefix.h;
-                                GCC_STRICT_ALIASING = YES;
-                                HEADER_SEARCH_PATHS = (
@@ -2161 +2137 @@
-                                LIBRARY_SEARCH_PATHS = $SYMROOT/Universal;
-                                MACOSX_DEPLOYMENT_TARGET = 10.4;
-
-
-
-
+
+
-                                PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
+                                SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
-                                SDKROOT = macosx10.4;
-                                STRIP_INSTALLED_PRODUCT = NO;
-                        };
-                        name = Deployment;
@@ -2181 +2155 @@
-                        isa = XCBuildConfiguration;
-                        buildSettings = {
-                                COPY_PHASE_STRIP = YES;
-                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                                GCC_MODEL_TUNING = G5;
-                                GCC_OPTIMIZATION_LEVEL = s;
-                                GCC_VERSION = 4.0;
-                                INSTALL_PATH = /usr/local/lib;
-                                PREBINDING = NO;
-                                PRODUCT_NAME = ebml;
-                                STRIP_STYLE = "non-global";
-                                USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/libebml";
-                        };
@@ -2197 +2167 @@
-                        isa = XCBuildConfiguration;
-                        buildSettings = {
-                                COPY_PHASE_STRIP = YES;
-                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                                GCC_MODEL_TUNING = G5;
-                                GCC_VERSION = 4.0;
-                                INSTALL_PATH = /usr/local/lib;
-                                PREBINDING = NO;
-                                PRODUCT_NAME = matroska;
-                                STRIP_STYLE = "non-global";
-                                USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/libmatroska $(SRCROOT)/libebml";
-                        };
@@ -2212 +2178 @@
-                        isa = XCBuildConfiguration;
-                        buildSettings = {
-                                DEAD_CODE_STRIPPING = YES;
-                                EXPORTED_SYMBOLS_FILE = "$(SOURCE_ROOT)/exportedSymbols";
-                                GCC_ALTIVEC_EXTENSIONS = YES;
-                                GCC_ENABLE_OBJC_GC = supported;
-                                GCC_FAST_MATH = YES;
-                                GCC_MODEL_TUNING = G5;
-                                GCC_OPTIMIZATION_LEVEL = 3;
-                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                                GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
-                                GCC_STRICT_ALIASING = YES;
-                                GCC_VERSION = 4.0;
-                                "GCC_VERSION[arch=*]" = "";
@@ -2235 +2196 @@
-                                INFOPLIST_PREPROCESS = YES;
-                                INSTALL_PATH = "$(HOME)/Library/QuickTime";
-                                OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))";
-                                OTHER_CFLAGS_i386 = "-march=pentium-m -frerun-cse-after-loop $(OTHER_CFLAGS)";
-                                OTHER_CFLAGS_ppc = "-mcpu=G3 -mtune=G5 -funroll-loops -mmultiple $(OTHER_CFLAGS)";
-                                OTHER_LDFLAGS = (
-                                        "-read_only_relocs",
@@ -2243 +2201 @@
-                                );
-                                OTHER_REZFLAGS = "-rd -d ppc_$(ppc) -d i386_$(i386) -d TARGET_REZ_CARBON_MACHO=1";
-                                PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
-                                PRODUCT_NAME = Perian;
-                                WARNING_CFLAGS = "-Wimplicit";
@@ -2315 +2272 @@
-                                        i386,
-                                );
-                                COPY_PHASE_STRIP = YES;
-                                GCC_DYNAMIC_NO_PIC = NO;
-                                GCC_ENABLE_OBJC_GC = supported;
-                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                                GCC_MODEL_TUNING = G5;
-                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                                GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-                                GCC_VERSION = 4.0;
-                                "GCC_VERSION[arch=*]" = "";
-                                "GCC_VERSION[sdk=macosx10.4][arch=*]" = 4.0;
+                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
+                                GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
+                                GCC_WARN_SHADOW = YES;
+                                GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
-                                INFOPLIST_FILE = "Plists/PerianPaneReal-Info.plist";
-                                INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-C";
@@ -2330 +2287 @@
-                                INFOPLIST_PREPROCESS = YES;
-                                INSTALL_PATH = "$(HOME)/Library/Bundles";
-                                OTHER_LDFLAGS = (
-                                        "-framework",
-                                        Foundation,
-                                        "-framework",
-                                        AppKit,
-                                );
-                                PREBINDING = NO;
-                                PRODUCT_NAME = Perian;
-                                SDKROOT = macosx10.4;
@@ -2348 +2298 @@
-                        isa = XCBuildConfiguration;
-                        buildSettings = {
-                                COPY_PHASE_STRIP = YES;
-                                GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                                GCC_MODEL_TUNING = G5;
-                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                                GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-                                GCC_VERSION = 4.0;
-                                INFOPLIST_FILE = "Plists/PerianUpdateChecker-Info.plist";
-                                INSTALL_PATH = "$(HOME)/Applications";
-                                OTHER_LDFLAGS = (
-                                        "-framework",
-                                        Foundation,
-                                        "-framework",
-                                        AppKit,
-                                );
-                                PREBINDING = NO;
-                                PRODUCT_NAME = PerianUpdateChecker;
-                                WRAPPER_EXTENSION = app;
@@ -2373 +2312 @@
-                        buildSettings = {
-                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-                                COPY_PHASE_STRIP = NO;
-                                DEAD_CODE_STRIPPING = YES;
-                                DEBUG_INFORMATION_FORMAT = dwarf;
+                                GCC_ALTIVEC_EXTENSIONS = YES;
-                                GCC_DYNAMIC_NO_PIC = YES;
+                                GCC_INCREASE_PRECOMPILED_HEADER_SHARING = YES;
-                                GCC_MODEL_TUNING = G5;
+                                GCC_PREFIX_HEADER = Prefix.h;
-                                GCC_PREPROCESSOR_DEFINITIONS = DEBUG_BUILD;
-                                GCC_STRICT_ALIASING = YES;
@@ -2387 +2328 @@
-                                );
-                                LIBRARY_SEARCH_PATHS = $SYMROOT/Universal;
-
-
-
-
+
+
-                                PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
+                                SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
-                                SDKROOT = macosx10.4;
-                                STRIP_INSTALLED_PRODUCT = NO;
-                        };
-                        name = "Deployment+Debug";
@@ -2480 +2419 @@
-                        isa = XCBuildConfiguration;
-                        buildSettings = {
-                                COPY_PHASE_STRIP = NO;
-                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                                GCC_MODEL_TUNING = G5;
-                                GCC_OPTIMIZATION_LEVEL = 0;
-                                GCC_VERSION = 4.0;
-                                INSTALL_PATH = /usr/local/lib;
-                                PREBINDING = NO;
-                                PRODUCT_NAME = ebml;
-                                STRIP_STYLE = "non-global";
-                                USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/libebml";
-                        };
@@ -2496 +2431 @@
-                        isa = XCBuildConfiguration;
-                        buildSettings = {
-                                COPY_PHASE_STRIP = YES;
-                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                                GCC_MODEL_TUNING = G5;
-                                GCC_OPTIMIZATION_LEVEL = s;
-                                GCC_VERSION = 4.0;
-                                INSTALL_PATH = /usr/local/lib;
-                                PREBINDING = NO;
-                                PRODUCT_NAME = ebml;
-                                STRIP_STYLE = "non-global";
-                                USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/libebml";
-                        };
@@ -2512 +2443 @@
-                        isa = XCBuildConfiguration;
-                        buildSettings = {
-                                COPY_PHASE_STRIP = NO;
-                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                                GCC_MODEL_TUNING = G5;
-                                GCC_OPTIMIZATION_LEVEL = 0;
-                                GCC_VERSION = 4.0;
-                                INSTALL_PATH = /usr/local/lib;
-                                PREBINDING = NO;
-                                PRODUCT_NAME = matroska;
-                                STRIP_STYLE = "non-global";
-                                USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/libmatroska $(SRCROOT)/libebml";
-                        };
@@ -2528 +2455 @@
-                        isa = XCBuildConfiguration;
-                        buildSettings = {
-                                COPY_PHASE_STRIP = YES;
-                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                                GCC_MODEL_TUNING = G5;
-                                GCC_VERSION = 4.0;
-                                INSTALL_PATH = /usr/local/lib;
-                                PREBINDING = NO;
-                                PRODUCT_NAME = matroska;
-                                STRIP_STYLE = "non-global";
-                                USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/libmatroska $(SRCROOT)/libebml";
-                        };
@@ -2548 +2471 @@
-                                        i386,
-                                );
-                                COPY_PHASE_STRIP = NO;
-                                GCC_DYNAMIC_NO_PIC = NO;
-                                GCC_ENABLE_OBJC_GC = supported;
-                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                                GCC_MODEL_TUNING = G5;
-                                GCC_OPTIMIZATION_LEVEL = 0;
-                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                                GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-                                GCC_VERSION = 4.0;
-                                "GCC_VERSION[arch=*]" = "";
@@ -2562 +2481 @@
-                                GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
-                                GCC_WARN_SHADOW = YES;
-                                GCC_WARN_SIGN_COMPARE = YES;
-                                GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
-                                GCC_WARN_UNUSED_VALUE = YES;
-                                GCC_WARN_UNUSED_VARIABLE = YES;
-                                INFOPLIST_FILE = "Plists/PerianPaneReal-Info.plist";
-                                INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-C";
@@ -2571 +2487 @@
-                                INFOPLIST_PREPROCESS = YES;
-                                INSTALL_PATH = "$(HOME)/Library/Bundles";
-                                ONLY_ACTIVE_ARCH = YES;
-                                OTHER_LDFLAGS = (
-                                        "-framework",
-                                        Foundation,
-                                        "-framework",
-                                        AppKit,
-                                );
-                                PREBINDING = NO;
-                                PRODUCT_NAME = Perian;
-                                SDKROOT = macosx10.4;
@@ -2595 +2503 @@
-                                        i386,
-                                );
-                                COPY_PHASE_STRIP = YES;
-                                GCC_DYNAMIC_NO_PIC = NO;
-                                GCC_ENABLE_OBJC_GC = supported;
-                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                                GCC_MODEL_TUNING = G5;
-                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                                GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-                                GCC_VERSION = 4.0;
-                                "GCC_VERSION[arch=*]" = "";
-                                "GCC_VERSION[sdk=macosx10.4][arch=*]" = 4.0;
+                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
+                                GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
+                                GCC_WARN_SHADOW = YES;
+                                GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
-                                INFOPLIST_FILE = "Plists/PerianPaneReal-Info.plist";
-                                INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-C";
@@ -2610 +2518 @@
-                                INFOPLIST_PREPROCESS = YES;
-                                INSTALL_PATH = "$(HOME)/Library/Bundles";
-                                OTHER_LDFLAGS = (
-                                        "-framework",
-                                        Foundation,
-                                        "-framework",
-                                        AppKit,
-                                );
-                                PREBINDING = NO;
-                                PRODUCT_NAME = Perian;
-                                SDKROOT = macosx10.4;
@@ -2780 +2681 @@
-                        );
-                        defaultConfigurationIsVisible = 0;
-Development
+"Deployment+Debug"
-                };
-                11A70AC80A3D0111002058D4 /* Build configuration list for PBXNativeTarget "Perian" */ = {
@@ -2790 +2691 @@
-                        );
-                        defaultConfigurationIsVisible = 0;
-Development
+"Deployment+Debug"
-                };
-                11BA39B00A61E453008AF206 /* Build configuration list for PBXAggregateTarget "ffmpeg Static Libraries" */ = {
@@ -2800 +2701 @@
-                        );
-                        defaultConfigurationIsVisible = 0;
-Development
+"Deployment+Debug"
-                };
-                11D4ED470A3CE59A0066D45F /* Build configuration list for PBXProject "Perian" */ = {
@@ -2810 +2711 @@
-                        );
-                        defaultConfigurationIsVisible = 0;
-Development
+"Deployment+Debug"
-                };
-                3DAD080D0FBF7C71001E156F /* Build configuration list for PBXNativeTarget "ssa2html" */ = {
@@ -2820 +2721 @@
-                        );
-                        defaultConfigurationIsVisible = 0;
-Development
+"Deployment+Debug"
-                };
-                3DAD09AD0FBFAB59001E156F /* Build configuration list for PBXNativeTarget "detect-encoding" */ = {
@@ -2830 +2731 @@
-                        );
-                        defaultConfigurationIsVisible = 0;
-Development
+"Deployment+Debug"
-                };
-                61CB11030ACDF37C007994BD /* Build configuration list for PBXNativeTarget "ebml" */ = {
@@ -2840 +2741 @@
-                        );
-                        defaultConfigurationIsVisible = 0;
-Development
+"Deployment+Debug"
-                };
-                61CB11B00ACDF4FF007994BD /* Build configuration list for PBXNativeTarget "matroska" */ = {
@@ -2850 +2751 @@
-                        );
-                        defaultConfigurationIsVisible = 0;
-Development
+"Deployment+Debug"
-                };
-                83D1D6CA0B4C794900E09EC9 /* Build configuration list for PBXNativeTarget "PerianPane" */ = {
@@ -2860 +2761 @@
-                        );
-                        defaultConfigurationIsVisible = 0;
-Development
+"Deployment+Debug"
-                };
-                F5121EBB0EB3A5680048EF67 /* Build configuration list for PBXAggregateTarget "Make SVN Rev" */ = {
@@ -2870 +2771 @@
-                        );
-                        defaultConfigurationIsVisible = 0;
-Development
+"Deployment+Debug"
-                };
-                F59E0A0B0A670E950019A3F0 /* Build configuration list for PBXAggregateTarget "Debug In QuickTime Player" */ = {
@@ -2880 +2781 @@
-                        );
-                        defaultConfigurationIsVisible = 0;
-Development
+"Deployment+Debug"
-                };
-                F5CFD1B80B5000AF00616865 /* Build configuration list for PBXNativeTarget "PerianPanePListGenerator" */ = {
@@ -2890 +2791 @@
-                        );
-                        defaultConfigurationIsVisible = 0;
-Development
+"Deployment+Debug"
-                };
-                F5CFD2650B500B9D00616865 /* Build configuration list for PBXAggregateTarget "CreatePrefPanePlist" */ = {
@@ -2900 +2801 @@
-                        );
-                        defaultConfigurationIsVisible = 0;
-Development
+"Deployment+Debug"
-                };
-                F5CFD2EA0B5012E800616865 /* Build configuration list for PBXAggregateTarget "A52Codec" */ = {
@@ -2910 +2811 @@
-                        );
-                        defaultConfigurationIsVisible = 0;
-Development
+"Deployment+Debug"
-                };
-                F5CFD3C10B50144E00616865 /* Build configuration list for PBXAggregateTarget "Setup Build Directories" */ = {
@@ -2920 +2821 @@
-                        );
-                        defaultConfigurationIsVisible = 0;
-Development
+"Deployment+Debug"
-                };
-/* End XCConfigurationList section */

branches/perian-1.1/Release/Changes.txt

@@ -21 +21 @@
-- Fixed several memory leaks [r1086]
-- Fixed a problem with wrong channel order in DTS 5.1 [r1076]
+- Fixed possible conflict with UniversalDetector.framework [r1100]
-Subtitles:
-- Fixed garbage characters appearing at the end of a line with some fonts [r1013]

branches/perian-1.1/Subtitles/SubATSUIRenderer.h

@@ -34 +34 @@
-        ATSUTextLayout layout;
-        float screenScaleX, screenScaleY, videoWidth, videoHeight;
+        BOOL drawTextBounds;
-        @public;
-        CGColorSpaceRef srgbCSpace;

branches/perian-1.1/Subtitles/SubATSUIRenderer.m

@@ -25 +25 @@
-#import "SubUtilities.h"
-#import "Codecprintf.h"
+#import "CommonUtils.h"
-
-static float GetWinFontSizeScale(ATSFontRef font);
@@ -254 +255 @@
-                UCCreateTextBreakLocator(NULL, 0, kUCTextBreakLineMask, &breakLocator);
-                context = [[SubContext alloc] initWithNonSSAType:kSubTypeSRT delegate:self];
+                
+                drawTextBounds = CFPreferencesGetAppBooleanValue(CFSTR("DrawSubTextBounds"), PERIAN_PREF_DOMAIN, NULL);
-        }
-        
@@ -278 +281 @@
-                UCCreateTextBreakLocator(NULL, 0, kUCTextBreakLineMask, &breakLocator);
-                context = [[SubContext alloc] initWithHeaders:headers styles:styles delegate:self];
+                
+                drawTextBounds = CFPreferencesGetAppBooleanValue(CFSTR("DrawSubTextBounds"), PERIAN_PREF_DOMAIN, NULL);
-        }
-        
@@ -365 +370 @@
-                                break;
-                        }
-
-
-
-
+
+
+
+
+
-        
-        [fontIDCache setValue:[NSNumber numberWithInt:font] forKey:[name lowercaseString]];
@@ -467 +473 @@
-        CGColorRef color;
-        CGAffineTransform mat;
+        ATSFontRef oldFont;
-        
-#define bv() bval = *(int*)p;
@@ -504 +511 @@
-                case tag_fn:
-                        sv();
+                        oldFont = spanEx->font;
-                        spanEx->fontVertical = ParseFontVerticality(&sval) ? kATSUStronglyVertical : kATSUStronglyHorizontal;
-                        spanEx->font = GetFontIDForSSAName(sval);
+                        if (oldFont != spanEx->font) spanEx->platformSizeScale = GetWinFontSizeScale(spanEx->font);
-                        UpdateFontNameSize(spanEx, screenScaleY);
-                        break;
@@ -600 +609 @@
-#pragma mark Rendering Helper Functions
-
+// XXX see comment for GetTypographicRectangleForLayout
-static ATSUTextMeasurement GetLineHeight(ATSUTextLayout layout, UniCharArrayOffset lpos)
-{
@@ -618 +628 @@
-}
-
+// XXX some broken fonts have very wrong typographic values set, and so this occasionally gives nonsense
+// it should be checked against the real pixel box (see #if 0 below), but for correct fonts it looks much better
-static void GetTypographicRectangleForLayout(ATSUTextLayout layout, UniCharArrayOffset *breaks, ItemCount breakCount, Fixed extraHeight, Fixed *lX, Fixed *lY, Fixed *height, Fixed *width)
-{
@@ -653 +665 @@
-}
-
+// Draw the text bounds on screen under the actual text
+// Note that it almost never appears where it's supposed to be, and I'm not sure if that's my fault or ATSUI's
+static void VisualizeLayoutLineHeights(CGContextRef c, ATSUTextLayout layout, UniCharArrayOffset *breaks, ItemCount breakCount, Fixed extraHeight, Fixed penX, Fixed penY, float screenHeight)
+{
+        ATSTrapezoid trap = {0};
+        Rect pixRect = {0};
+        ItemCount trapCount;
+        int i;
+        
+        CGContextSetLineWidth(c, 3.0);
+        
+        for (i = breakCount; i >= 0; i--) {
+                UniCharArrayOffset end = breaks[i+1];
+
+                ATSUMeasureTextImage(layout, breaks[i], end-breaks[i], 0, 0, &pixRect);
+                ATSUGetGlyphBounds(layout, 0, 0, breaks[i], end-breaks[i], kATSUseDeviceOrigins, 1, &trap, &trapCount);
+                
+                CGContextSetRGBStrokeColor(c, 1,0,0,1);
+                CGContextBeginPath(c);
+                CGContextMoveToPoint(c, FixedToFloat(penX + trap.upperLeft.x),  FixedToFloat(penY + trap.lowerLeft.y));
+                CGContextAddLineToPoint(c, FixedToFloat(penX + trap.upperRight.x),  FixedToFloat(penY + trap.lowerRight.y));
+                CGContextAddLineToPoint(c, FixedToFloat(penX + trap.lowerRight.x),  FixedToFloat(penY + trap.upperRight.y));
+                CGContextAddLineToPoint(c, FixedToFloat(penX + trap.lowerLeft.x),  FixedToFloat(penY + trap.upperLeft.y));
+                CGContextClosePath(c);
+                CGContextStrokePath(c);
+                CGContextSetRGBStrokeColor(c, 0, 0, 1, 1);
+                CGContextStrokeRect(c, CGRectMake(FixedToFloat(penX) + pixRect.left, FixedToFloat(penY) + pixRect.top, pixRect.right - pixRect.left, pixRect.bottom - pixRect.top));
+                
+                penY += GetLineHeight(layout, breaks[i]) + extraHeight;
+        }
+}
+
-#if 0
-static void GetImageBoundingBoxForLayout(ATSUTextLayout layout, UniCharArrayOffset *breaks, ItemCount breakCount, Fixed extraHeight, Fixed *lX, Fixed *lY, Fixed *height, Fixed *width)
@@ -674 +718 @@
-                largeRect.top = MIN(largeRect.top, rect.top);
-                largeRect.right = MAX(largeRect.right, rect.right);
-               
+
-        
-        
@@ -1075 +1119 @@
-                breakbuffer = FindLineBreaks(layout, div, breakLocator, breakbuffer, &breakCount, breakingWidth, ubuffer, textLen);
-
-
+, descent
-                UniCharArrayOffset *breaks = breakbuffer;
-
+
-                if (div->positioned || div->alignV == kSubAlignmentMiddle)
-                        GetTypographicRectangleForLayout(layout, breaks, breakCount, FloatToFixed(div->styleLine->outlineRadius), NULL, NULL, &imageHeight, &imageWidth);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                if (!div->positioned) {
-                        penX = FloatToFixed(NSMinX(marginRect));
@@ -1087 +1145 @@
-                                case kSubAlignmentBottom: default:
-                                        if (!bottomPen || resetPens) {
-
-
-
+
-                                        } else penY = bottomPen;
-                                        
@@ -1110 +1166 @@
-                        }
-                } else {
-                        ATSUTextMeasurement descent;
-                        penX = FloatToFixed(div->posX * screenScaleX);
-                        penY = FloatToFixed((context->resY - div->posY) * screenScaleY);
@@ -1119 +1174 @@
-                        }
-                        
-                        ATSUGetLineControl(layout, kATSUFromTextBeginning, kATSULineDescentTag, sizeof(ATSUTextMeasurement), &descent, NULL);
-
-                        switch (div->alignV) {
-                                case kSubAlignmentMiddle: penY -= imageHeight / 2; break;
@@ -1139 +1192 @@
-                }
-                
+                if (drawTextBounds)
+                        VisualizeLayoutLineHeights(c, layout, breaks, breakCount, FloatToFixed(div->styleLine->outlineRadius), penX, penY, cHeight);
+
-                breakc.breakCount = breakCount;
-                breakc.breaks = breaks;
@@ -1306 +1362 @@
-
-// Windows and OS X use different TrueType fields to measure text.
-
+(?)
-// XXX This function doesn't read from the right fonts; if we're using italic variant, it should get the ATSFontRef for that
+// XXX^2 This should be cached
-static float GetWinFontSizeScale(ATSFontRef font)
-{

branches/perian-1.1/UniversalDetector/UniversalDetector.h

@@ -1 +1 @@
-#import <Cocoa/Cocoa.h>
-
+#define UniversalDetector SubUniversalDetector
-
-@interface UniversalDetector:NSObject

branches/perian-1.1/UniversalDetector/UniversalDetector.xcodeproj/project.pbxproj

@@ -625 +625 @@
-                        isa = XCBuildConfiguration;
-                        buildSettings = {
-                                COPY_PHASE_STRIP = NO;
-                                DYLIB_COMPATIBILITY_VERSION = 1;
-                                DYLIB_CURRENT_VERSION = 1;
-                                FRAMEWORK_VERSION = A;
-                                GCC_DYNAMIC_NO_PIC = NO;
-                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                                GCC_MODEL_TUNING = G5;
-                                GCC_OPTIMIZATION_LEVEL = 0;
@@ -639 +637 @@
-                                PRODUCT_NAME = UniversalDetector;
-                                WRAPPER_EXTENSION = framework;
-                                ZERO_LINK = NO;
-                        };
-                        name = Debug;
@@ -653 +650 @@
-                                DYLIB_CURRENT_VERSION = 1;
-                                FRAMEWORK_VERSION = A;
-                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                                GCC_MODEL_TUNING = G5;
-                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -661 +657 @@
-                                PRODUCT_NAME = UniversalDetector;
-                                WRAPPER_EXTENSION = framework;
-                                ZERO_LINK = NO;
-                        };
-                        name = Release;
@@ -668 +663 @@
-                        isa = XCBuildConfiguration;
-                        buildSettings = {
+                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-                                GCC_ENABLE_OBJC_GC = YES;
-                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -694 +690 @@
-                        isa = XCBuildConfiguration;
-                        buildSettings = {
-                                COPY_PHASE_STRIP = NO;
-                                GCC_DYNAMIC_NO_PIC = NO;
-                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                                GCC_MODEL_TUNING = G5;
-                                GCC_OPTIMIZATION_LEVEL = 0;
-                                GCC_VERSION = 4.0;
-                                INSTALL_PATH = /usr/local/lib;
-                                PREBINDING = NO;
-                                PRODUCT_NAME = universaldetector;
-                                ZERO_LINK = YES;
-                        };
-                        name = Debug;
@@ -711 +702 @@
-                        isa = XCBuildConfiguration;
-                        buildSettings = {
-
-
-
+
-                                GCC_MODEL_TUNING = G5;
-                                GCC_VERSION = 4.0;
-                                INSTALL_PATH = /usr/local/lib;
-                                PREBINDING = NO;
-                                PRODUCT_NAME = universaldetector;
-                                ZERO_LINK = NO;
-                        };
-                        name = Release;

branches/perian-1.1/createStaticLibs.sh

@@ -8 +8 @@
-
-generalConfigureOptions="--disable-muxers --disable-encoders --disable-stripping --disable-amd3dnow --enable-runtime-cpudetect --enable-pthreads --disable-ffmpeg --disable-network --disable-ffplay --disable-ffserver"
-g -
+
-
-if [ "$BUILD_STYLE" = "Development" ] ; then