Changeset 36

Show
Ignore:
Timestamp:
03/07/07 13:52:41 (2 years ago)
Author:
gbooker
Message:

Fixed clipping as seen in http://trac.perian.org/ticket/118

Fixed incorrect reading of prefs for the stereo settings.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/A52/ACShepA52Decoder.cpp

    r34 r36  
    9898                else if(type == CFNumberGetTypeID()) 
    9999                        CFNumberGetValue((CFNumberRef)dynRange, kCFNumberDoubleType, &dynamicRangeCompression); 
    100                 else 
     100                else if(type == CFBooleanGetTypeID()) 
     101        { 
     102            if(CFBooleanGetValue((CFBooleanRef)dynRange)) 
     103                dynamicRangeCompression = 0.2; 
     104            else 
     105                dynamicRangeCompression = 1;             
     106        } 
     107        else 
    101108                        dynamicRangeCompression = 1; 
    102109                CFRelease(dynRange); 
     
    110117                CFTypeID type = CFGetTypeID(dynRange); 
    111118                if(type == CFStringGetTypeID()) 
    112                         dynamicRangeCompression = CFStringGetIntValue((CFStringRef)dynRange); 
     119                        useStereoOverDolby = CFStringGetIntValue((CFStringRef)dynRange); 
    113120                else if(type == CFNumberGetTypeID()) 
    114                         CFNumberGetValue((CFNumberRef)dynRange, kCFNumberIntType, &dynamicRangeCompression); 
     121                        CFNumberGetValue((CFNumberRef)dynRange, kCFNumberIntType, &useStereoOverDolby); 
    115122                else 
    116123                        useStereoOverDolby = 0; 
     
    429436                        bias = 384; 
    430437                } else { 
    431                         level = 2 << 30; 
     438                        level = 1 << 30; 
    432439                        bias = 0; 
    433440                } 
  • trunk/A52Codec.xcodeproj/project.pbxproj

    r34 r36  
    183183                65CB364E066A1FA900A75A43 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = "<absolute>"; }; 
    184184                F50815870A2161180092BF70 /* XCAResources.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; path = XCAResources.r; sourceTree = "<group>"; }; 
    185                 F50B7AB50AAB69C600065C78 /* A52Preferences.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = A52Preferences.app; sourceTree = BUILT_PRODUCTS_DIR; }; 
     185                F50B7AB50AAB69C600065C78 /* Preferences.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Preferences.app; sourceTree = BUILT_PRODUCTS_DIR; }; 
    186186                F50B7AB70AAB69C700065C78 /* Preferences-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Preferences-Info.plist"; sourceTree = "<group>"; }; 
    187187                F50B7AC40AAB6E3F00065C78 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/A52CodecPreferences.nib; sourceTree = "<group>"; }; 
     
    366366                                F5BDACAD0A20A00000FF4884 /* A52Codec.component */, 
    367367                                F5525DF70A3BF78A00F36B86 /* AC3MovieImport.component */, 
    368                                 F50B7AB50AAB69C600065C78 /* A52Preferences.app */, 
     368                                F50B7AB50AAB69C600065C78 /* Preferences.app */, 
    369369                        ); 
    370370                        name = Products; 
     
    499499                        name = A52Preferences; 
    500500                        productName = Preferences; 
    501                         productReference = F50B7AB50AAB69C600065C78 /* A52Preferences.app */; 
     501                        productReference = F50B7AB50AAB69C600065C78 /* Preferences.app */; 
    502502                        productType = "com.apple.product-type.application"; 
    503503                };