Changeset 369

Timestamp:

03/13/07 16:49:05 (1 year ago)

Author:

gbooker

Message:

Changed the dynamic compression to a slider (since it accepts all values between 0 and 1)
More updater modifications.

Files:

• trunk/CPFPerianPrefPaneController.h (modified) (2 diffs)
• trunk/CPFPerianPrefPaneController.m (modified) (6 diffs)
• trunk/PerianPrefPane.nib/classes.nib (modified) (3 diffs)
• trunk/PerianPrefPane.nib/keyedobjects.nib (modified) (previous)

trunk/CPFPerianPrefPaneController.h

@@ -56 +56 @@
-        
-        //AC3
-
+
+
-        IBOutlet NSButton                                       *button_ac3StereoOverDolby;
-        
@@ -84 +85 @@
-
-//AC3
-- (IBAction)setAC3DynamicRange:(id)sender;
-- (IBAction)setAC3StereoOverDolby:(id)sender;
+- (IBAction)setAC3DynamicRangeValue:(id)sender;
+- (IBAction)setAC3DynamicRangeSlider:(id)sender;
-
-//About

trunk/CPFPerianPrefPaneController.m

@@ -4 +4 @@
-#define AC3DynamicRangeKey CFSTR("dynamicRange")
-#define AC3StereoOverDolbyKey CFSTR("useStereoOverDolby")
+#define LastInstalledVersionKey CFSTR("LastInstalledVersion")
+
+@interface CPFPerianPrefPaneController(_private)
+- (void)setAC3DynamicRange:(float)newVal;
+@end
-
-@implementation CPFPerianPrefPaneController
-
-ivate
+eferences
-
-- (void)setButton:(NSButton *)button fromKey:(CFStringRef)key forAppID:(CFStringRef)appID withDefault:(BOOL)defaultValue
-{
-       
+
-        value = CFPreferencesCopyAppValue(key, appID);
-        if(value && CFGetTypeID(value) == CFBooleanGetTypeID())
@@ -29 +34 @@
-                CFPreferencesSetAppValue(key, kCFBooleanFalse, appID);
-}
+
+- (float)getFloatFromKey:(CFStringRef)key forAppID:(CFStringRef)appID withDefault:(float)defaultValue
+{
+    CFPropertyListRef value;
+    float ret = defaultValue;
+    
+        value = CFPreferencesCopyAppValue(key, appID);
+        if(value && CFGetTypeID(value) == CFNumberGetTypeID())
+                CFNumberGetValue(value, kCFNumberFloatType, &ret);
+        
+        if(value)
+                CFRelease(value);
+    
+    return ret;
+}
+
+- (void)setKey:(CFStringRef)key forAppID:(CFStringRef)appID fromString:(NSString *)value
+{
+    CFPreferencesSetAppValue(key, value, appID);
+}
+
+- (NSString *)getStringFromKey:(CFStringRef)key forAppID:(CFStringRef)appID
+{
+    CFPropertyListRef value;
+    NSString *ret = nil;
+    
+        value = CFPreferencesCopyAppValue(key, appID);
+        if(value && CFGetTypeID(value) == CFStringGetTypeID())
+                ret = [NSString stringWithString:(NSString *)value];
+        
+        if(value)
+                CFRelease(value);
+    
+    return ret;
+}
+
+- (void)setKey:(CFStringRef)key forAppID:(CFStringRef)appID fromFloat:(float)value
+{
+    CFNumberRef numRef = CFNumberCreate(NULL, kCFNumberFloatType, &value);
+    CFPreferencesSetAppValue(key, numRef, appID);
+    CFRelease(numRef);
+}
+
+#pragma mark Private Functions
-
-- (NSString *)installationBasePath:(BOOL)userInstallation
@@ -108 +157 @@
-                perianWebSiteURL = [[NSURL alloc] initWithString:@"http://perian.org"];
-                
-p
+P
-                a52AppID = CFSTR("com.cod3r.a52codec");
-                
@@ -190 +239 @@
-        /* General */
-        [self checkForInstallation];
+    NSString *lastInstVersion = [self getStringFromKey:LastInstalledVersionKey forAppID:perianAppID];
+    NSString *myVersion = [[[self bundle] infoDictionary] objectForKey:BundleVersionKey];
+    if((lastInstVersion == nil || [lastInstVersion compare:myVersion] == NSOrderedAscending) && installStatus != InstallStatusInstalled)
+    {
+        [self installUninstall:nil];
+        [self setKey:LastInstalledVersionKey forAppID:perianAppID fromString:myVersion];
+    }
-        
-        /* A52 Prefs */
-        [self setButton:button_ac3DynamicRange fromKey:AC3DynamicRangeKey forAppID:a52AppID withDefault:NO];
-        [self setButton:button_ac3StereoOverDolby fromKey:AC3StereoOverDolbyKey forAppID:a52AppID withDefault:NO];
+    [self setAC3DynamicRange:[self getFloatFromKey:AC3DynamicRangeKey forAppID:a52AppID withDefault:1.0]];
-}
-
@@ -498 +554 @@
-- (IBAction)updateCheck:(id)sender 
-{
+    FSRef updateCheckRef;
+    
+    OSStatus status = FSPathMakeRef((UInt8 *)[[[[self bundle] bundlePath] stringByAppendingPathComponent:@"Contents/Resources/PerianUpdateChecker.app"] fileSystemRepresentation], &updateCheckRef, NULL);
+    if(status != noErr)
+        return;
+    
+    LSOpenFSRef(&updateCheckRef, NULL);
-} 
-
@@ -506 +569 @@
-
-#pragma mark AC3 
-- (IBAction)setAC3DynamicRange:(id)sender 
-{
-        [self setKey:AC3DynamicRangeKey forAppID:a52AppID fromButton:button_ac3DynamicRange];
-} 
-
-- (IBAction)setAC3StereoOverDolby:(id)sender 
-{
-        [self setKey:AC3StereoOverDolbyKey forAppID:a52AppID fromButton:button_ac3StereoOverDolby];
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#pragma mark About 

trunk/PerianPrefPane.nib/classes.nib

@@ -7 +7 @@
-                launchForum = id; 
-                launchWebsite = id; 
-
+
+
-                setAC3StereoOverDolby = id; 
-                setAutoUpdateCheck = id; 
@@ -15 +16 @@
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                "button_ac3DynamicRange" = NSButton; 
-                "button_ac3StereoOverDolby" = NSButton; 
-                "button_autoUpdateCheck" = NSButton; 
@@ -25 +25 @@
-                "progress_install" = NSProgressIndicator; 
-                "progress_updateCheck" = NSProgressIndicator; 
+                "slider_ac3DynamicRangeSlider" = NSSlider; 
+                "textField_ac3DynamicRangeValue" = NSTextField; 
-                "textField_currentVersion" = NSTextField; 
-                "textField_installStatus" = NSTextField;