Changeset 1024

Timestamp:

10/21/07 12:41:16 (15 months ago)

Author:

stephen_booth

Message:

Cleaned up

Files:

• trunk/Audio/Properties/MonkeysAudioPropertiesReader.mm (modified) (3 diffs)

trunk/Audio/Properties/MonkeysAudioPropertiesReader.mm

@@ -29 +29 @@
 
 - (BOOL) readProperties:(NSError **)error
-{
-        NSMutableDictionary                             *propertiesDictionary;
-        NSString                                                *path;
-        IAPEDecompress                                  *decompressor;
-        str_utf16                                               *chars;
-        int                                                             result;
-        
+{       
         // Setup converter
-        path                    = [[self valueForKey:StreamURLKey] path];
-        chars                   = GetUTF16FromANSI([path fileSystemRepresentation]);
+        NSString        *path   = [[self valueForKey:StreamURLKey] path];
+        str_utf16       *chars  = GetUTF16FromANSI([path fileSystemRepresentation]);
         NSAssert(NULL != chars, NSLocalizedStringFromTable(@"Unable to allocate memory.", @"Errors", @""));
         
-        decompressor    = CreateIAPEDecompress(chars, &result); 
+        int result;
+        IAPEDecompress *decompressor = CreateIAPEDecompress(chars, &result);    
         if(NULL == decompressor || ERROR_SUCCESS != result) {
                 if(nil != error) {
@@ -58 +53 @@
         }
 
-        propertiesDictionary = [NSMutableDictionary dictionary];
+        NSMutableDictionary *propertiesDictionary = [NSMutableDictionary dictionary];
         
         [propertiesDictionary setValue:NSLocalizedStringFromTable(@"Monkey's Audio", @"Formats", @"") forKey:PropertiesFileTypeKey];
@@ -64 +59 @@
         [propertiesDictionary setValue:NSLocalizedStringFromTable(@"APE", @"Formats", @"") forKey:PropertiesFormatDescriptionKey];
         [propertiesDictionary setValue:[NSNumber numberWithLongLong:decompressor->GetInfo(APE_DECOMPRESS_TOTAL_BLOCKS)] forKey:PropertiesTotalFramesKey];
-        //      [propertiesDictionary setValue:[NSNumber numberWithLong:bitrate] forKey:@"averageBitrate"];
+//      [propertiesDictionary setValue:[NSNumber numberWithLong:bitrate] forKey:@"averageBitrate"];
         [propertiesDictionary setValue:[NSNumber numberWithUnsignedInt:decompressor->GetInfo(APE_INFO_BITS_PER_SAMPLE)] forKey:PropertiesBitsPerChannelKey];
         [propertiesDictionary setValue:[NSNumber numberWithUnsignedInt:decompressor->GetInfo(APE_INFO_CHANNELS)] forKey:PropertiesChannelsPerFrameKey];