Changeset 842

Timestamp:

05/26/2009 08:34:59 AM (3 years ago)

Author:

gbooker

Message:

Added DTS passthrough.

Files:

• branches/CoreData/SapphireFrappliance/Players/SapphireVideoPlayerController.m (modified) (5 diffs)

branches/CoreData/SapphireFrappliance/Players/SapphireVideoPlayerController.m

@@ -30 +30 @@
 #define A52_DOMIAN                      (CFStringRef)@"com.cod3r.a52codec"
 
-#define SOUND_STATE_SOUND_ENABLED               1
-#define SOUND_STATE_SOUND_PASSTHROUGH   2
-#define SOUND_STATE_PLAYER_TORNDOWN             4
+#define DTS_PASSTHROUGH_KEY CFSTR("attemptDTSPassthrough")
+#define PERIAN_DOMAIN CFSTR("org.perian.Perian")
+
+#define SOUND_STATE_SOUND_ENABLED                                       1
+#define SOUND_STATE_AC3_PASSTHROUGH_WAS_ENABLED         2
+#define SOUND_STATE_PLAYER_TORNDOWN                                     4
+#define SOUND_STATE_DTS_PASSTHROUGH_WAS_ENABLED         8
 
 @interface BRVideoPlayerController (compat)
@@ -178 +182 @@
         SapphireSettings *settings = [SapphireSettings sharedSettings];
         BOOL useAC3Passthrough = NO;
+        BOOL useDTSPassthrough = NO;
 
         if([settings useAC3Passthrough])
@@ -186 +191 @@
                 if((type == 'ac-3' || type == 0x6D732000) && setupAudioOutput((int)sampleRate))
                         useAC3Passthrough = YES;
+                else if((type == 'DTS ') && setupAudioOutput((int)sampleRate))
+                        useDTSPassthrough = YES;
         }
         
         Boolean temp;
-        BOOL passthrough = CFPreferencesGetAppBooleanValue(PASSTHROUGH_KEY, A52_DOMIAN, &temp);
+        BOOL AC3PassthroughEnabled = CFPreferencesGetAppBooleanValue(PASSTHROUGH_KEY, A52_DOMIAN, &temp);
+        BOOL DTSPassthroughEnabled = CFPreferencesGetAppBooleanValue(DTS_PASSTHROUGH_KEY, PERIAN_DOMAIN, &temp);
         BOOL soundsWereEnabled = NO;
-        if(useAC3Passthrough)
+        if(useAC3Passthrough || useDTSPassthrough)
         {
                 RUIPreferences *prefs = [SapphireFrontRowCompat sharedFrontRowPreferences];
@@ -197 +205 @@
                 if(soundsWereEnabled)
                         [prefs setBool:NO forKey:@"PlayFrontRowSounds"];
+        }
+        if(useAC3Passthrough)
                 CFPreferencesSetAppValue(PASSTHROUGH_KEY, (CFNumberRef)[NSNumber numberWithInt:1], A52_DOMIAN);
-        }
         else
                 CFPreferencesSetAppValue(PASSTHROUGH_KEY, (CFNumberRef)[NSNumber numberWithInt:0], A52_DOMIAN);
-        soundState = (passthrough ? SOUND_STATE_SOUND_PASSTHROUGH : 0) | (soundsWereEnabled ? SOUND_STATE_SOUND_ENABLED : 0);
+        if(useDTSPassthrough)
+                CFPreferencesSetAppValue(DTS_PASSTHROUGH_KEY, (CFNumberRef)[NSNumber numberWithInt:1], PERIAN_DOMAIN);
+        else
+                CFPreferencesSetAppValue(DTS_PASSTHROUGH_KEY, (CFNumberRef)[NSNumber numberWithInt:0], PERIAN_DOMAIN);
+        soundState = (AC3PassthroughEnabled ? SOUND_STATE_AC3_PASSTHROUGH_WAS_ENABLED : 0) |
+                                 (soundsWereEnabled ? SOUND_STATE_SOUND_ENABLED : 0) |
+                                 (DTSPassthroughEnabled ? SOUND_STATE_DTS_PASSTHROUGH_WAS_ENABLED : 0);
         CFPreferencesAppSynchronize(A52_DOMIAN);
+        CFPreferencesAppSynchronize(PERIAN_DOMAIN);
 }
 
@@ -218 +234 @@
         soundState |= SOUND_STATE_PLAYER_TORNDOWN;
         //Turn off the AC3 Passthrough hack
-        CFPreferencesSetAppValue(PASSTHROUGH_KEY, (CFNumberRef)[NSNumber numberWithInt:((soundState & SOUND_STATE_SOUND_PASSTHROUGH)? 1 : 0)], A52_DOMIAN);
+        CFPreferencesSetAppValue(PASSTHROUGH_KEY, (CFNumberRef)[NSNumber numberWithInt:((soundState & SOUND_STATE_AC3_PASSTHROUGH_WAS_ENABLED)? 1 : 0)], A52_DOMIAN);
         CFPreferencesAppSynchronize(A52_DOMIAN);
+        CFPreferencesSetAppValue(DTS_PASSTHROUGH_KEY, (CFNumberRef)[NSNumber numberWithInt:((soundState & SOUND_STATE_DTS_PASSTHROUGH_WAS_ENABLED)? 1 : 0)], PERIAN_DOMAIN);
+        CFPreferencesAppSynchronize(PERIAN_DOMAIN);
         if(soundState & SOUND_STATE_SOUND_ENABLED)
                 [[SapphireFrontRowCompat sharedFrontRowPreferences] setBool:YES forKey:@"PlayFrontRowSounds"];