Changeset 1185

Timestamp:

10/25/09 02:30:03 (9 months ago)

Author:

astrange

Message:

Move the list of apps needing transparent blend mode to a defaults setting.
Also rename some things for consistency.

Location:

trunk

Files:

• CommonUtils.c (modified) (4 diffs)
• CommonUtils.h (modified) (1 diff)
• FFusionCodec.c (modified) (1 diff)
• Subtitles/SubATSUIRenderer.m (modified) (1 diff)
• Subtitles/SubImport.mm (modified) (1 diff)

trunk/CommonUtils.c

@@ -300 +300 @@
 }
 
-static const CFStringRef defaultFrameDroppingWhiteList[] = {
+static const CFStringRef defaultFrameDroppingList[] = {
         CFSTR("Finder"),
         CFSTR("Front Row"),
@@ -308 +308 @@
         CFSTR("QuickTime Player"),
         CFSTR("Spiral")
+};
+
+static const CFStringRef defaultTransparentSubtitleList[] = {
+        CFSTR("CoreMediaAuthoringSourcePropertyHelper"),
+        CFSTR("Front Row")
 };
 
@@ -384 +389 @@
         if (enabled == -1)
                 enabled = isApplicationNameInList(CFSTR("FrameDroppingWhiteList"),
-                                                                                  defaultFrameDroppingWhiteList,
-                                                                                  sizeof(defaultFrameDroppingWhiteList)/sizeof(defaultFrameDroppingWhiteList[0]));
+                                                                                  defaultFrameDroppingList,
+                                                                                  sizeof(defaultFrameDroppingList)/sizeof(defaultFrameDroppingList[0]));
         return enabled;
 }
 
-int forcePerianToDecode()
+int IsForcedDecodeEnabled()
 {
         static int forced = -1;
@@ -400 +405 @@
 }
 
+int IsTransparentSubtitleHackEnabled()
+{
+        static int forced = -1;
+        
+        if(forced == -1)
+                forced = isApplicationNameInList(CFSTR("TransparentModeSubtitleAppList"),
+                                                                                 defaultTransparentSubtitleList,
+                                                                                 sizeof(defaultTransparentSubtitleList)/sizeof(defaultTransparentSubtitleList[0]));
+        return forced;
+}
+
 int IsAltivecSupported()
 {

trunk/CommonUtils.h

@@ -55 +55 @@
 
 // does the current process break if we return errors in Preflight?
-int forcePerianToDecode();
+int IsForcedDecodeEnabled();
+
+// does the current process break if we use graphicsModePreBlackAlpha?
+int IsTransparentSubtitleHackEnabled();
 
 int IsAltivecSupported();

trunk/FFusionCodec.c

@@ -571 +571 @@
                 decode = FFUSION_PREFER_NOT_DECODE;
         if(decode > FFUSION_CANNOT_DECODE)
-                if(forcePerianToDecode())
+                if(IsForcedDecodeEnabled())
                         decode = FFUSION_PREFER_DECODE;
         return decode > FFUSION_PREFER_NOT_DECODE;

trunk/Subtitles/SubATSUIRenderer.m

@@ -1288 +1288 @@
         CGColorSpaceRelease(csp);
         */
-        
         SubDisposeRenderer(s);
 }

trunk/Subtitles/SubImport.mm

@@ -85 +85 @@
 static bool ShouldEngageFrontRowHack(void)
 {
-        bool ret;
-        Boolean isSet;
-        
-        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-        NSString *applicationName = [[NSProcessInfo processInfo] processName];
         long minorVersion;
         Gestalt(gestaltSystemVersionMinor, &minorVersion);
-        if (!CFPreferencesGetAppBooleanValue(CFSTR("PerianFrontRowSubtitleHack"),CFSTR("org.perian.Perian"),&isSet))
-                isSet = 1;
-        
-        bool systemVersionCheck = (minorVersion >= 5) && (minorVersion <= 6);
-        bool appNameCheck = ([applicationName isEqualToString:@"Front Row"] || [applicationName isEqualToString:@"CoreMediaAuthoringSourcePropertyHelper"]);
-        ret = systemVersionCheck && appNameCheck && isSet;
-        [pool release];
-        
-        return ret;
+        
+        bool systemVersionCheck = minorVersion >= 5;
+        bool appNameCheck = IsTransparentSubtitleHackEnabled();
+        
+        return systemVersionCheck && appNameCheck;
 }