Changeset 1151 for branches

Timestamp:

02/19/10 21:07:32 (2 years ago)

Author:

gbooker

Message:

Moved the setting of the SPDIF device to initiate playback since this is after the controller has a chance to set the pref instead of before.

Location:

branches/PlayerFramework/CommonMediaPlayer/Media Players/DVD Framework

Files:

• CMPDVDPlayer.m (modified) (2 diffs)
• CMPDVDPlayerController.m (modified) (1 diff)

branches/PlayerFramework/CommonMediaPlayer/Media Players/DVD Framework/CMPDVDPlayer.m

@@ -686 +686 @@
 - (void)initiatePlaybackWithResume:(BOOL *)resume;
 {
+        DVDAudioMode audioMode = 0;
+        //See if we can go SPDIF
+        OSStatus SPDIFresult = DVDGetAudioOutputModeCapabilities(&audioMode);
+        NSLog(@"SPDIF get is %d with mode %d", SPDIFresult, audioMode);
+        if(audioMode & kDVDAudioModeSPDIF)
+        {
+                //Engage the SPDIF interface
+                SPDIFresult = DVDSetAudioOutputMode(kDVDAudioModeSPDIF);
+                NSLog(@"Set to SPDIF with result %d", SPDIFresult);
+                SPDIFresult = DVDSetSPDIFDataOutDevice(0);
+                NSLog(@"Set SPDIF device with result %d", SPDIFresult);
+        }       
+        
         DVDGetNumTitles(&titleCount);
         BOOL doingResume = titleCount == 1 && resumeTime != 0;
@@ -1079 +1092 @@
                         return NO;
         }
-        if(result == noErr)
-        {
-                DVDAudioMode audioMode = 0;
-                //See if we can go SPDIF
-                OSStatus SPDIFresult = DVDGetAudioOutputModeCapabilities(&audioMode);
-                NSLog(@"SPDIF get is %d with mode %d", SPDIFresult, audioMode);
-                if(audioMode & kDVDAudioModeSPDIF)
-                {
-                        //Engage the SPDIF interface
-                        SPDIFresult = DVDSetAudioOutputMode(kDVDAudioModeSPDIF);
-                        NSLog(@"Set to SPDIF with result %d", SPDIFresult);
-                        SPDIFresult = DVDSetSPDIFDataOutDevice(0);
-                        NSLog(@"Set SPDIF device with result %d", SPDIFresult);
-                }
-        }
         return result == noErr;
 }

branches/PlayerFramework/CommonMediaPlayer/Media Players/DVD Framework/CMPDVDPlayerController.m

@@ -167 +167 @@
                 passthroughValue = kCFBooleanTrue;
         
-        CFPreferencesSetAppValue(CFSTR("engageCAC3Device"), passthroughValue, CFSTR("com.cod3r.ac3passthroughdevice"));
+        CFStringRef devDomain = CFSTR("com.cod3r.ac3passthroughdevice");
+        CFPreferencesSetAppValue(CFSTR("engageCAC3Device"), passthroughValue, devDomain);
+        CFPreferencesAppSynchronize(devDomain);
 }