Changeset 1204

Timestamp:

03/09/2010 05:11:28 PM (2 years ago)

Author:

gbooker

Message:

Reduce memory usage by creating NSImages on demand instead of every single time. Also reduced 3 arrays to one and used type checking to see what data it currently has. This makes a difference with The Dark Knight which has 100 images, consuming 80MB. This is a lot for the ATV which only has a total of 256.

Location:

trunk/SapphireFrappliance/MetaDataImporting

Files:

• SapphirePosterChooser.h (modified) (2 diffs)
• SapphirePosterChooser.m (modified) (10 diffs)

trunk/SapphireFrappliance/MetaDataImporting/SapphirePosterChooser.h

@@ -32 +32 @@
 @interface SapphirePosterChooser : SapphireMediaMenuController <BRIconSourceProtocol, BRMenuListItemProvider, SapphireLayoutDelegate, SapphireChooser> {
         BOOL                                    displayed;              /*!< @brief YES if currently displayed, NO otherwise*/
-        NSMutableArray                  *posters;               /*!< @brief The array of poster urls and after loaded, the NSImages*/
-        NSMutableArray                  *posterLayers;  /*!< @brief The image layers of posters*/
-        NSMutableArray                  *posterData;    /*!< @brief The data for the poster images*/
+        NSMutableArray                  *posters;               /*!< @brief The array of poster urls, NSImages, NSData, or BlurredImages*/
         NSString                                *fileName;              /*!< @brief The movie filename*/
         NSString                                *movieTitle;    /*!< @brief The title of the movie*/
@@ -77 +75 @@
 
 /*!
- * @brief The list of posters to choose from
- *
- * @return The list of posters to choose from
- */
-- (NSArray *)posters;
-
-/*!
- * @brief Loads the posters from disk
- */
-- (void)loadPosters;
-
-/*!
  * @brief Sets the filename to display
  *

trunk/SapphireFrappliance/MetaDataImporting/SapphirePosterChooser.m

@@ -41 +41 @@
 @interface SapphirePosterChooser ()
 - (BRBlurryImageLayer *)getPosterLayerForData:(NSData *)thePosterData;
-- (void)loadPoster:(int)index;
-- (void)reloadPosterWithData:(NSData *)data atIndex:(int)intIndex;
+- (void)loadPosters;
+- (void)loadPosterWithURL:(int)index;
+- (void)reloadPosterWithDataAtIndex:(int)intIndex;
 @end
 
@@ -93 +94 @@
 //    [posterMarch setIconSource: nil];  //This throws an exception
         [posters release];
-        [posterLayers release];
-        [posterData release];
         [fileName release];
         [movieTitle release];
@@ -157 +156 @@
 #pragma mark List of posters
 
+- (void)freePosterMarch
+{
+        [posterMarch release];
+        posterMarch = nil;
+}
+
 - (void)setPosters:(NSArray *)posterList
 {
         posters = [posterList mutableCopy];
         if([posters count] > 5)
-        {
-                [posterMarch release];
-                posterMarch = nil;
+                [self freePosterMarch];
+        else
+        {
+                [posterMarch setIconSource: self];
         }
         [self loadPosters];
-    [posterMarch setIconSource: self];
         [[self list] setDatasource:self];
 }
@@ -174 +179 @@
         posters = [posterList retain];
 
-        [posterMarch release];
-        posterMarch = nil;
-
-        [[self list] setDatasource: self];
+        [self freePosterMarch];
+        [[self list] setDatasource:self];
 }
 
@@ -188 +191 @@
 {
         int i, count = [posters count];
-        posterLayers = [posters mutableCopy];
-        posterData = [[NSMutableArray alloc] initWithCapacity:[posters count]];
-        NSNull *nsnull = [NSNull null];
         for(i=0; i<count; i++)
-                [posterData addObject:nsnull];
-        for(i=0; i<count; i++)
-                [self loadPoster:i];
+                [self loadPosterWithURL:i];
         [posterMarch reload];
         [SapphireFrontRowCompat renderScene:[self scene]];
@@ -204 +202 @@
  * @param The index of the poster to load
  */
-- (void)loadPoster:(int)index;
+- (void)loadPosterWithURL:(int)index;
 {
         NSString *posterURL = [posters objectAtIndex:index];
-        [posterLayers replaceObjectAtIndex:index withObject:[self getPosterLayerForData:nil]];
         [[SapphireApplianceController urlLoader] loadDataURL:posterURL withTarget:self selector:@selector(gotPosterData:atIndex:) object:[NSNumber numberWithInt:index] withPriority:YES];
 }
@@ -213 +210 @@
 - (void)gotPosterData:(NSData *)data atIndex:(NSNumber *)index;
 {
-        if(displayed)
-                [self reloadPosterWithData:data atIndex:[index intValue]];
-        else if(data != nil)
-                [posterData replaceObjectAtIndex:[index intValue] withObject:data];
-        else
-                [posterData replaceObjectAtIndex:[index intValue] withObject:[NSData data]];
-}
-
-- (void)reloadPosterWithData:(NSData *)data atIndex:(int)intIndex;
-{
-        [posterLayers replaceObjectAtIndex:intIndex withObject:[self getPosterLayerForData:data]];
-        NSImage *image = [[NSImage alloc] initWithData:data];
-        if(image == nil)
-                image = [errorNSImage retain];
-        [posters replaceObjectAtIndex:intIndex withObject:image];
-        [image release];
+        if(data != nil)
+                [posters replaceObjectAtIndex:[index intValue] withObject:data];
+        else
+                [posters replaceObjectAtIndex:[index intValue] withObject:[NSData data]];
+        if(displayed && posterMarch)
+                [self reloadPosterWithDataAtIndex:[index intValue]];
+}
+
+- (void)reloadPosterWithDataAtIndex:(int)intIndex;
+{
+        NSData *data = [posters objectAtIndex:intIndex];
+        [posters replaceObjectAtIndex:intIndex withObject:[self getPosterLayerForData:data]];
         [posterMarch _updateIcons];
         if([self getSelection] == intIndex)
@@ -367 +360 @@
 - (long)iconCount
 {
-        return [posterLayers count];
+        return [posters count];
 }
 
 - (NSDictionary *)iconInfoAtIndex:(long)index
 {
-        return [NSDictionary dictionaryWithObject:[posterLayers objectAtIndex:index] forKey:@"icon"];
+        id poster = [posters objectAtIndex:index];
+        if([poster isKindOfClass:[NSString class]] || [poster isKindOfClass:[NSData class]])
+                poster = defaultImage;
+        return [NSDictionary dictionaryWithObject:poster forKey:@"icon"];
 }
 
 - (id)iconAtIndex:(long)index
 {
-    if ( index >= [posterLayers count] )
+    if ( index >= [posters count] )
         return nil;
         
-    return [posterLayers objectAtIndex:index];
+    return [posters objectAtIndex:index];
 }
 
@@ -410 +406 @@
                 id poster = [posters objectAtIndex:row];
                 
-                if(![poster isKindOfClass:[NSString class]])
+                if([poster isKindOfClass:[NSImage class]])
                         [asset setImage:poster];
+                else if([poster isKindOfClass:[NSData class]])
+                {
+                        NSImage *image = [[NSImage alloc] initWithData:poster];
+                        if(image)
+                        {
+                                [asset setImage:image];
+                                [image release];
+                        }
+                        else
+                                [asset setImage:errorNSImage];
+                }
                 else
                         [asset setImage:defaultNSImage];
@@ -555 +562 @@
         [super wasPushed];
         displayed = YES;
-        int i, count = [posterData count];
-        for(i=0; i<count; i++)
-        {
-                id obj = [posterData objectAtIndex:i];
-                if([obj isKindOfClass:[NSData class]])
-                        [self reloadPosterWithData:obj atIndex:i];
+        if(posterMarch)
+        {
+                int i, count = [posters count];
+                for(i=0; i<count; i++)
+                {
+                        id obj = [posters objectAtIndex:i];
+                        if([obj isKindOfClass:[NSData class]])
+                                [self reloadPosterWithDataAtIndex:i];
+                }
         }
 }