Changeset 220

Timestamp:

09/10/07 22:32:44 (1 year ago)

Author:

gbooker

Message:

Changed to use the File Class number

Files:

• trunk/SapphireMetaData.h (modified) (2 diffs)
• trunk/SapphireMetaData.m (modified) (3 diffs)

trunk/SapphireMetaData.h

@@ -50 +50 @@
-        FILE_CLASS_TV_SHOW = 1,
-        FILE_CLASS_MOVIE = 2,
+        FILE_CLASS_AUDIO = 3,
+        FILE_CLASS_IMAGE = 4,
+        FILE_CLASS_OTHER = 5,
-} FileClass;
-
@@ -181 +184 @@
-- (NSString *)showID;
-- (NSString *)showName ;
-- (void)setMediaType: (unsigned int) type ;
-- (int)mediaType ;
-- (NSString *)sizeString;
-

trunk/SapphireMetaData.m

@@ -37 +37 @@
-#define AUDIO_FORMAT_KEY                        @"Audio Format"
-#define FILE_CLASS_KEY                          @"File Class"
-#define MEDIA_TYPE_KEY                          @"Media Type"
-/* Media Types:
-*       0=      Unknown Media Type (init)
-*       1=      TV Show
-*       2=      Movie
-*       3=      Audio
-*       4=      Image
-*       5=      Other   (User Selected)
-*/
-
-@implementation NSString (episodeSorting)
@@ -1454 +1445 @@
-                [fileMeta setObject:[NSNumber numberWithInt:modTime] forKey:MODIFIED_KEY];
-                [fileMeta setObject:[props objectForKey:NSFileSize] forKey:SIZE_KEY];
-                [fileMeta setObject:[NSNumber numberWithUnsignedInt:0] forKey:MEDIA_TYPE_KEY] ;
-                [fileMeta setObject:[NSNumber numberWithInt:META_FILE_VERSION] forKey:META_VERSION_KEY];
-                
@@ -1795 +1785 @@
-}
-
-/*!
-* @brief Sets the media type of the file
- *
- * @param mediaType The media type of the file
- */
-- (void)setMediaType: (unsigned int) type
-{
-        [metaData setObject:[NSNumber numberWithUnsignedInt:type] forKey:MEDIA_TYPE_KEY];
-}
-
-/*!
-* @brief Returns the media type of the file
- *
- * @return The media type of the file
- */
-- (int)mediaType
-{
-        [self constructCombinedData] ;
-        return [[combinedInfo objectForKey:MEDIA_TYPE_KEY] intValue] ;
-}
-
-/*Makes a pretty size string for the file*/
-- (NSString *)sizeString