Changeset 1320

Timestamp:

09/13/10 14:40:56 (21 months ago)

Author:

gbooker

Message:

Updated more enums with better names (no functionality change)

Location:

trunk/SapphireFrappliance

Files:

• Browser/SapphireBrowser.m (modified) (7 diffs)
• Browser/SapphireDisplayMenu.m (modified) (1 diff)
• Browser/SapphireMarkMenu.m (modified) (2 diffs)
• Browser/SapphireMediaPreview.m (modified) (2 diffs)
• MetaData/SapphireMObjects/SapphireDirectoryMetaData.m (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireFileMetaData.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireFileMetaData.m (modified) (16 diffs)
• MetaData/SapphireMObjects/SapphireXMLData.m (modified) (1 diff)
• MetaDataImporting/SapphireMovieImporter.m (modified) (3 diffs)
• MetaDataImporting/SapphireNfoImporter.m (modified) (3 diffs)
• MetaDataImporting/SapphireQuickTimeImporter.m (modified) (1 diff)
• MetaDataImporting/SapphireTVShowImporter.m (modified) (3 diffs)
• MetaDataImporting/SapphireXMLFileDataImporter.m (modified) (3 diffs)
• Players/SapphireCMPWrapper.m (modified) (1 diff)
• Settings/SapphireCollectionSettings.m (modified) (1 diff)
• Settings/SapphireRadioSetting.m (modified) (1 diff)
• Settings/SapphireSettings.m (modified) (1 diff)

trunk/SapphireFrappliance/Browser/SapphireBrowser.m

@@ -308 +308 @@
                                 fileCls=[meta fileClassValue];
                                 BOOL rightTextSet = NO;
-                                if(fileCls==FILE_CLASS_TV_SHOW)
+                                if(fileCls==FileClassTVShow)
                                 {
                                         SapphireEpisode *ep = [meta tvEpisode];
@@ -329 +329 @@
                                         }
                                 }
-                                if(fileCls==FILE_CLASS_MOVIE)
+                                if(fileCls==FileClassMovie)
                                 {
                                         SapphireMovie *movie = [meta movie];
@@ -384 +384 @@
                 else if(!watched) gemString = BLUE_GEM_KEY;
                 else if(favorite) gemString = YELLOW_GEM_KEY;
-                else if(fileCls==FILE_CLASS_AUDIO) gemString = GREEN_GEM_KEY;
+                else if(fileCls==FileClassAudio) gemString = GREEN_GEM_KEY;
                 else gemString = RED_GEM_KEY;;
                 [SapphireFrontRowCompat setLeftIcon:[theme gem:gemString] forMenu:result];
@@ -456 +456 @@
         }
         
-        if([currentPlayFile fileClassValue] == FILE_CLASS_TV_SHOW)
+        if([currentPlayFile fileClassValue] == FileClassTVShow)
         {
                 SapphireEpisode *episode = [currentPlayFile tvEpisode];
@@ -473 +473 @@
                         [reqComp addObject:[NSString stringWithFormat:@"showname=%@", showName]];
         }
-        else if([currentPlayFile fileClassValue] == FILE_CLASS_MOVIE)
+        else if([currentPlayFile fileClassValue] == FileClassMovie)
         {
                 fileClass=2;
@@ -492 +492 @@
                 request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"http://appletv.nanopi.net/ext.php"]];
                 //The fileClass is never used in these cases later
-                //                              if([currentPlayFile fileClassValue] == FILE_CLASS_UNKNOWN)
+                //                              if([currentPlayFile fileClassValue] == FileClassUnknown)
                 //                                       fileClass=0;
-                //                              if([currentPlayFile fileClassValue] == FILE_CLASS_AUDIO)
+                //                              if([currentPlayFile fileClassValue] == FileClassAudio)
                 //                                       fileClass=3;
-                if([currentPlayFile fileClassValue] == FILE_CLASS_OTHER)
+                if([currentPlayFile fileClassValue] == FileClassOther)
                         fileClass=5;
                 else
@@ -558 +558 @@
         }
         
-        if([currentPlayFile fileContainerTypeValue] == FILE_CONTAINER_TYPE_VIDEO_TS && path != nil)
+        if([currentPlayFile fileContainerTypeValue] == FileContainerTypeVideoTS && path != nil)
         {
                 SapphireCMPWrapper *wrapper = [[SapphireCMPWrapper alloc] initWithFile:currentPlayFile scene:[self scene]];

trunk/SapphireFrappliance/Browser/SapphireDisplayMenu.m

@@ -231 +231 @@
                 NSMutableDictionary *markMeta=[[NSMutableDictionary alloc] init];
                 [markMeta setObject:markName forKey:META_TITLE_KEY];
-                [markMeta setObject:[NSNumber numberWithInt:FILE_CLASS_UTILITY] forKey:FILE_CLASS_KEY];
+                [markMeta setObject:[NSNumber numberWithInt:FileClassUtility] forKey:FILE_CLASS_KEY];
                 [markMeta setObject:markDescription forKey:META_DESCRIPTION_KEY];
                 SapphireMediaPreview *preview = [[SapphireMediaPreview alloc] initWithScene:[self scene]];

trunk/SapphireFrappliance/Browser/SapphireMarkMenu.m

@@ -347 +347 @@
                                         nil]];
                 }
-                if([fileMeta fileClass] != FILE_CLASS_UNKNOWN)
+                if([fileMeta fileClass] != FileClassUnknown)
                 {
                         [marks addObject:
@@ -922 +922 @@
                 NSMutableDictionary *markMeta=[[NSMutableDictionary alloc] init];
                 [markMeta setObject:markName forKey:META_TITLE_KEY];
-                [markMeta setObject:[NSNumber numberWithInt:FILE_CLASS_UTILITY] forKey:FILE_CLASS_KEY];
+                [markMeta setObject:[NSNumber numberWithInt:FileClassUtility] forKey:FILE_CLASS_KEY];
                 [markMeta setObject:markDescription forKey:META_DESCRIPTION_KEY];
                 SapphireMediaPreview *preview = [[SapphireMediaPreview alloc] initWithScene:[self scene]];

trunk/SapphireFrappliance/Browser/SapphireMediaPreview.m

@@ -514 +514 @@
         NSArray *order = nil;
         NSMutableDictionary *allMeta = nil;
-        FileClass fileClass=FILE_CLASS_UNKNOWN ;
+        FileClass fileClass=FileClassUnknown ;
         if([meta respondsToSelector:@selector(getDisplayedMetaDataInOrder:)])
         {
                 allMeta=[(id)meta getDisplayedMetaDataInOrder:&order];
                 if([meta conformsToProtocol:@protocol(SapphireDirectory)])
-                        fileClass=FILE_CLASS_NOT_FILE;
+                        fileClass=FileClassNotFile;
                 else
                         fileClass=(FileClass)[(SapphireFileMetaData *) meta fileClassValue];
         }
         if(!allMeta)
-                fileClass=FILE_CLASS_UTILITY;
+                fileClass=FileClassUtility;
         if(imageOnly)
         {       
-                fileClass = FILE_CLASS_NOT_FILE;
+                fileClass = FileClassNotFile;
                 [allMeta removeAllObjects];
         }
@@ -533 +533 @@
         BRMetadataLayer *metaLayer = [self gimmieMetadataLayer];
         /* TV Show Preview Handeling */
-        if(fileClass==FILE_CLASS_TV_SHOW)
+        if(fileClass==FileClassTVShow)
         {
                 [self  populateTVShowMetadataWith:allMeta];
         }
         /* Movie Preview Handeling */
-        else if(fileClass==FILE_CLASS_MOVIE)
+        else if(fileClass==FileClassMovie)
         {
                 [self populateMovieMetadataWith:allMeta];
         }
         /* Utility Preview Handeling */
-        else if(fileClass == FILE_CLASS_UTILITY)
+        else if(fileClass == FileClassUtility)
         {
                 [self populateUtilityDataWith:(NSMutableDictionary *)meta];
         }
-        else if(fileClass != FILE_CLASS_NOT_FILE)
+        else if(fileClass != FileClassNotFile)
         {
                 [self populateGenericMetadataWith:allMeta];

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireDirectoryMetaData.m

@@ -402 +402 @@
                         }
                         if([fm hasVIDEO_TS:filePath])
-                                subFile.fileContainerTypeValue = FILE_CONTAINER_TYPE_VIDEO_TS;
+                                subFile.fileContainerTypeValue = FileContainerTypeVideoTS;
                         else
-                                subFile.fileContainerTypeValue = FILE_CONTAINER_TYPE_QT_MOVIE;
+                                subFile.fileContainerTypeValue = FileContainerTypeQTMovie;
                 }
         }

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileMetaData.h

@@ -72 +72 @@
 
 typedef enum {
-        FILE_CLASS_UTILITY= -2,
-        FILE_CLASS_NOT_FILE= -1,
-        FILE_CLASS_UNKNOWN = 0,
-        FILE_CLASS_TV_SHOW = 1,
-        FILE_CLASS_MOVIE = 2,
-        FILE_CLASS_AUDIO = 3,
-        FILE_CLASS_IMAGE = 4,
-        FILE_CLASS_OTHER = 5,
+        FileClassUtility= -2,
+        FileClassNotFile= -1,
+        FileClassUnknown = 0,
+        FileClassTVShow = 1,
+        FileClassMovie = 2,
+        FileClassAudio = 3,
+        FileClassImage = 4,
+        FileClassOther = 5,
 } FileClass;
 
 typedef enum FileContainerType {
-        FILE_CONTAINER_TYPE_QT_MOVIE = 0,
-        FILE_CONTAINER_TYPE_VIDEO_TS = 1,
+        FileContainerTypeQTMovie = 0,
+        FileContainerTypeVideoTS = 1,
 } FileContainerType;
 

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileMetaData.m

@@ -244 +244 @@
                 if(ep != nil)
                 {
-                        self.fileClassValue = FILE_CLASS_TV_SHOW;
+                        self.fileClassValue = FileClassTVShow;
                         NSString *epCoverPath = [[SapphireMetaDataSupport collectionArtPath] stringByAppendingPathComponent:[ep path]];
                         NSString *oldBasePath = [[epCoverPath stringByDeletingLastPathComponent] stringByAppendingPathComponent:[self fileName]];
@@ -265 +265 @@
                 if(movie != nil)
                 {
-                        self.fileClassValue = FILE_CLASS_MOVIE;
+                        self.fileClassValue = FileClassMovie;
                         NSString *movieCoverPath = [movie coverArtPath];
                         NSString *oldBasePath = [[[SapphireMetaDataSupport collectionArtPath] stringByAppendingPathComponent:@"@MOVIES"] stringByAppendingPathComponent:[self fileName]];
@@ -342 +342 @@
         NSString *path = nil;
         NSFileManager *fm = [NSFileManager defaultManager];
-        if([self fileContainerTypeValue] == FILE_CONTAINER_TYPE_VIDEO_TS)
+        if([self fileContainerTypeValue] == FileContainerTypeVideoTS)
         {
                 NSString *vtsPath = [self.path stringByAppendingPathComponent:@"VIDEO_TS"];
@@ -405 +405 @@
         int match = ImportTypeMaskAll & ~ImportTypeMaskFile & ~ImportTypeMaskXML;
         switch (self.fileClassValue) {
-                case FILE_CLASS_TV_SHOW:
+                case FileClassTVShow:
                         match &= ~ImportTypeMaskMovie;
                         break;
-                case FILE_CLASS_MOVIE:
+                case FileClassMovie:
                         match &= ~ImportTypeMaskTVShow;
                         break;
@@ -444 +444 @@
         NSFileManager *fm = [NSFileManager defaultManager];
         
-        if(type == FILE_CONTAINER_TYPE_VIDEO_TS)
+        if(type == FileContainerTypeVideoTS)
         {
                 NSString *vtsPath = [path stringByAppendingPathComponent:@"VIDEO_TS"];
@@ -465 +465 @@
         [fileMeta setObject:[props objectForKey:NSFileSize] forKey:META_FILE_SIZE_KEY];
         
-        if(type == FILE_CONTAINER_TYPE_QT_MOVIE)
+        if(type == FileContainerTypeQTMovie)
         {
                 /*Open the movie*/
@@ -558 +558 @@
                 }
         } //QTMovie
-        else if(type == FILE_CONTAINER_TYPE_VIDEO_TS)
+        else if(type == FileContainerTypeVideoTS)
         {
                 SapphireVideoTsParser *dvd = [[SapphireVideoTsParser alloc] initWithPath:path];
@@ -757 +757 @@
         NSString * myArtPath=nil;
         
-        if([self fileClassValue]==FILE_CLASS_TV_SHOW)
+        if([self fileClassValue]==FileClassTVShow)
                 myArtPath=[[self tvEpisode] coverArtPath];
-        if([self fileClassValue]==FILE_CLASS_MOVIE)
+        if([self fileClassValue]==FileClassMovie)
                 myArtPath=[[self movie] coverArtPath];
         
@@ -840 +840 @@
         NSString *extension;
         NSString *newExtlessPath = newPath;
-        if(self.fileContainerTypeValue != FILE_CONTAINER_TYPE_VIDEO_TS)
+        if(self.fileContainerTypeValue != FileContainerTypeVideoTS)
                 newExtlessPath = [newExtlessPath stringByDeletingPathExtension];
         
@@ -902 +902 @@
                 return BRLocalizedString(@"A File name should not contain any '/' characters", @"Error indicating that filenames cannot contain / characters");
         NSString *oldPath = [self path];
-        if(self.fileContainerTypeValue != FILE_CONTAINER_TYPE_VIDEO_TS)
+        if(self.fileContainerTypeValue != FileContainerTypeVideoTS)
                 newFilename = [newFilename stringByAppendingPathExtension:[oldPath pathExtension]];
         NSString *newPath = [[oldPath stringByDeletingLastPathComponent] stringByAppendingPathComponent:newFilename];
@@ -996 +996 @@
 {
         NSString *ret = [self.path lastPathComponent];
-        if(self.fileContainerTypeValue != FILE_CONTAINER_TYPE_VIDEO_TS)
+        if(self.fileContainerTypeValue != FileContainerTypeVideoTS)
                 ret = [ret stringByDeletingPathExtension];
         
@@ -1005 +1005 @@
 {
         NSString *ret = self.path;
-        if(self.fileContainerTypeValue != FILE_CONTAINER_TYPE_VIDEO_TS)
+        if(self.fileContainerTypeValue != FileContainerTypeVideoTS)
                 ret = [ret stringByDeletingPathExtension];
         
@@ -1175 +1175 @@
         if(movie != nil)
         {
-                [self setFileClassValue:FILE_CLASS_MOVIE];
+                [self setFileClassValue:FileClassMovie];
                 self.importTypeValue |= ImportTypeMaskMovie;
         }
@@ -1190 +1190 @@
         if(ep != nil)
         {
-                [self setFileClassValue:FILE_CLASS_TV_SHOW];
+                [self setFileClassValue:FileClassTVShow];
                 self.importTypeValue |= ImportTypeMaskTVShow;
         }
@@ -1212 +1212 @@
 {
         FileClass xmlClass = self.xmlData.fileClassValue;
-        if(xmlClass != FILE_CLASS_UNKNOWN)
+        if(xmlClass != FileClassUnknown)
                 return xmlClass;
         return super.fileClassValue;
@@ -1220 +1220 @@
 {
         FileClass xmlClass = self.xmlData.fileClassValue;
-        if(xmlClass != FILE_CLASS_UNKNOWN)
-                self.xmlData.fileClassValue = FILE_CLASS_UNKNOWN;
+        if(xmlClass != FileClassUnknown)
+                self.xmlData.fileClassValue = FileClassUnknown;
         super.fileClassValue = fileClass;
 }

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireXMLData.m

@@ -264 +264 @@
         if(imdbNumber != 0)
                 ret = [SapphireMovie createMovieWithIMDB:imdbNumber inContext:[self managedObjectContext]];
-        else if(title != nil && [[self file] fileClassValue] == FILE_CLASS_MOVIE)
+        else if(title != nil && [[self file] fileClassValue] == FileClassMovie)
                 ret = [SapphireMovie createMovieWithTitle:title inContext:[self managedObjectContext]];
         else

trunk/SapphireFrappliance/MetaDataImporting/SapphireMovieImporter.m

@@ -405 +405 @@
         {
                 [currentData didImportType:ImportTypeMaskMovie];
-                if (status == ImportStateNotUpdated && [currentData fileClassValue] != FILE_CLASS_TV_SHOW)
-                        [currentData setFileClassValue:FILE_CLASS_UNKNOWN];
+                if (status == ImportStateNotUpdated && [currentData fileClassValue] != FileClassTVShow)
+                        [currentData setFileClassValue:FileClassUnknown];
         }
         [delegate backgroundImporter:self completedImportOnPath:state->path withState:status];
@@ -444 +444 @@
         NSString *path = [metaData path];
         BOOL ret = [[NSFileManager defaultManager] acceptFilePath:path];
-        if([metaData fileContainerType] == FILE_CONTAINER_TYPE_QT_MOVIE)
+        if([metaData fileContainerType] == FileContainerTypeQTMovie)
                 ret &= [[NSFileManager videoExtensions] containsObject:[path pathExtension]];
-        if([metaData fileClassValue]==FILE_CLASS_TV_SHOW) /* File is a TV Show - skip it */
+        if([metaData fileClassValue]==FileClassTVShow) /* File is a TV Show - skip it */
                 ret = NO;
         return ret;
@@ -462 +462 @@
         SapphireLog(SapphireLogTypeImport, SapphireLogLevelDebug, @"Going to movie import %@", path);
         NSString *extLessPath = path;
-        if([metaData fileContainerTypeValue] != FILE_CONTAINER_TYPE_VIDEO_TS)
+        if([metaData fileContainerTypeValue] != FileContainerTypeVideoTS)
                 extLessPath = [extLessPath stringByDeletingPathExtension];
         

trunk/SapphireFrappliance/MetaDataImporting/SapphireNfoImporter.m

@@ -49 +49 @@
         BOOL nfoPathIsDir = NO;
         NSString *extLessPath = path;
-        if([metaData fileContainerTypeValue] != FILE_CONTAINER_TYPE_VIDEO_TS)
+        if([metaData fileContainerTypeValue] != FileContainerTypeVideoTS)
                 extLessPath = [extLessPath stringByDeletingPathExtension];
         
@@ -56 +56 @@
                 return ImportStateNotUpdated;
         
-        if([metaData fileClassValue] != FILE_CLASS_UNKNOWN)
+        if([metaData fileClassValue] != FileClassUnknown)
                 return ImportStateNotUpdated;
         
@@ -75 +75 @@
                         if([[scraper contentType] isEqualToString:@"tvshows"])
                         {
-                                [metaData setFileClassValue:FILE_CLASS_TV_SHOW];
+                                [metaData setFileClassValue:FileClassTVShow];
                                 match = YES;
                         }
                         else if([[scraper contentType] isEqualToString:@"movies"])
                         {
-                                [metaData setFileClassValue:FILE_CLASS_MOVIE];
+                                [metaData setFileClassValue:FileClassMovie];
                                 match = YES;
                         }

trunk/SapphireFrappliance/MetaDataImporting/SapphireQuickTimeImporter.m

@@ -120 +120 @@
         int type = [[info valueForKey:TC_QT_TYPE] intValue];
         if(type==9)
-                [dict setObject:[NSNumber numberWithInt:FILE_CLASS_MOVIE] forKey:FILE_CLASS_KEY];
+                [dict setObject:[NSNumber numberWithInt:FileClassMovie] forKey:FILE_CLASS_KEY];
         else if(type==10) 
-                [dict setObject:[NSNumber numberWithInt:FILE_CLASS_TV_SHOW] forKey:FILE_CLASS_KEY];
+                [dict setObject:[NSNumber numberWithInt:FileClassTVShow] forKey:FILE_CLASS_KEY];
 
         value = [info objectForKey:TC_QT_COPYRIGHT];

trunk/SapphireFrappliance/MetaDataImporting/SapphireTVShowImporter.m

@@ -519 +519 @@
                         //QTMovie is broken on ATV, don't fetch images there
                         SapphireFileMetaData *metaData = tvState->file;
-                        if ([SapphireFrontRowCompat usingLeopard] && [metaData fileContainerTypeValue] == FILE_CONTAINER_TYPE_QT_MOVIE)
+                        if ([SapphireFrontRowCompat usingLeopard] && [metaData fileContainerTypeValue] == FileContainerTypeQTMovie)
                         {
                                 // NSImage-Extensions
@@ -565 +565 @@
         {
                 [currentData didImportType:ImportTypeMaskTVShow];
-                if (status == ImportStateNotUpdated && [currentData fileClassValue] != FILE_CLASS_MOVIE)
-                        [currentData setFileClassValue:FILE_CLASS_UNKNOWN];
+                if (status == ImportStateNotUpdated && [currentData fileClassValue] != FileClassMovie)
+                        [currentData setFileClassValue:FileClassUnknown];
         }
         [delegate backgroundImporter:self completedImportOnPath:state->path withState:status];
@@ -605 +605 @@
         //      NSArray *pathComponents = [path pathComponents];
         NSString *extLessPath = path;
-        if([metaData fileContainerTypeValue] != FILE_CONTAINER_TYPE_VIDEO_TS)
+        if([metaData fileContainerTypeValue] != FileContainerTypeVideoTS)
                 extLessPath = [extLessPath stringByDeletingPathExtension];
 

trunk/SapphireFrappliance/MetaDataImporting/SapphireXMLFileDataImporter.m

@@ -100 +100 @@
         BOOL xmlPathIsDir = NO;
         NSString *extLessPath = path;
-        if([metaData fileContainerTypeValue] != FILE_CONTAINER_TYPE_VIDEO_TS)
+        if([metaData fileContainerTypeValue] != FileContainerTypeVideoTS)
                 extLessPath = [extLessPath stringByDeletingPathExtension];
 
@@ -133 +133 @@
         
         NSString *type = [[root attributeForName:@"type"] stringValue];
-        FileClass fclass = FILE_CLASS_UNKNOWN;
+        FileClass fclass = FileClassUnknown;
         //Need to catch the media type {"TV Show" , "Movie"}
         if(type!=nil)
         {
                 if([type isEqualToString:@"TV Show"])
-                        fclass = FILE_CLASS_TV_SHOW;
+                        fclass = FileClassTVShow;
                 else if([type isEqualToString:@"Movie"])
-                        fclass = FILE_CLASS_MOVIE;
-                
-                if(fclass != FILE_CLASS_UNKNOWN)
+                        fclass = FileClassMovie;
+                
+                if(fclass != FileClassUnknown)
                         [newMetaData setObject:[NSNumber numberWithInt:fclass] forKey:FILE_CLASS_KEY];
         }
@@ -185 +185 @@
         /* Screen Cap */
         NSArray *imageCaps = [root objectsForXQuery:SCREENCAP_XML_QUERY error:&error];
-        if ( [imageCaps count] && [metaData fileContainerType] == FILE_CONTAINER_TYPE_QT_MOVIE )
+        if ( [imageCaps count] && [metaData fileContainerType] == FileContainerTypeQTMovie )
         {
                 unsigned int hour;

trunk/SapphireFrappliance/Players/SapphireCMPWrapper.m

@@ -36 +36 @@
         FileContainerType fileContainerType = aFile.fileContainerTypeValue;
         CMPPlayerManagerFileType playerType = CMPPlayerManagerFileTypeQTCompatibleVideo;
-        if(fileContainerType == FILE_CONTAINER_TYPE_VIDEO_TS)
+        if(fileContainerType == FileContainerTypeVideoTS)
                 playerType = CMPPlayerManagerFileTypeVideo_TS;
         

trunk/SapphireFrappliance/Settings/SapphireCollectionSettings.m

@@ -184 +184 @@
         NSMutableDictionary *settingMeta=[[NSMutableDictionary alloc] init];
         [settingMeta setObject:settingName forKey:META_TITLE_KEY];
-        [settingMeta setObject:[NSNumber numberWithInt:FILE_CLASS_UTILITY] forKey:FILE_CLASS_KEY];
+        [settingMeta setObject:[NSNumber numberWithInt:FileClassUtility] forKey:FILE_CLASS_KEY];
         [settingMeta setObject:settingDescription forKey:META_DESCRIPTION_KEY];
         SapphireMediaPreview *preview = [[SapphireMediaPreview alloc] initWithScene:[self scene]];

trunk/SapphireFrappliance/Settings/SapphireRadioSetting.m

@@ -142 +142 @@
                 NSMutableDictionary *settingMeta=[[NSMutableDictionary alloc] init];
                 [settingMeta setObject:[choices objectAtIndex:item] forKey:META_TITLE_KEY];
-                [settingMeta setObject:[NSNumber numberWithInt:FILE_CLASS_UTILITY] forKey:FILE_CLASS_KEY];
+                [settingMeta setObject:[NSNumber numberWithInt:FileClassUtility] forKey:FILE_CLASS_KEY];
                 [settingMeta setObject:[choiceDesc objectAtIndex:item] forKey:META_DESCRIPTION_KEY];
                 SapphireMediaPreview *preview = [[SapphireMediaPreview alloc] initWithScene:[self scene]];

trunk/SapphireFrappliance/Settings/SapphireSettings.m

@@ -787 +787 @@
         NSMutableDictionary *settingMeta=[[NSMutableDictionary alloc] init];
         [settingMeta setObject:settingName forKey:META_TITLE_KEY];
-        [settingMeta setObject:[NSNumber numberWithInt:FILE_CLASS_UTILITY] forKey:FILE_CLASS_KEY];
+        [settingMeta setObject:[NSNumber numberWithInt:FileClassUtility] forKey:FILE_CLASS_KEY];
         [settingMeta setObject:settingDescription forKey:META_DESCRIPTION_KEY];
         SapphireMediaPreview *preview = [[SapphireMediaPreview alloc] initWithScene:[self scene]];