Changeset 1175

Timestamp:

02/25/2010 09:45:06 AM (2 years ago)

Author:

gbooker

Message:

Reduce instantaneous memory usage by not creating images until they are going to be displayed. Hopefully reduce the swapping that occurs during large imports.

Location:

branches/PlayerFramework/SapphireFrappliance/MetaDataImporting

Files:

• SapphirePosterChooser.h (modified) (1 diff)
• SapphirePosterChooser.m (modified) (5 diffs)

branches/PlayerFramework/SapphireFrappliance/MetaDataImporting/SapphirePosterChooser.h

@@ -31 +31 @@
  */
 @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*/
         NSString                                *fileName;              /*!< @brief The movie filename*/
         NSString                                *movieTitle;    /*!< @brief The title of the movie*/

branches/PlayerFramework/SapphireFrappliance/MetaDataImporting/SapphirePosterChooser.m

@@ -42 +42 @@
 - (BRBlurryImageLayer *)getPosterLayerForData:(NSData *)thePosterData;
 - (void)loadPoster:(int)index;
+- (void)reloadPosterWithData:(NSData *)data atIndex:(int)intIndex;
 @end
 
@@ -93 +94 @@
         [posters release];
         [posterLayers release];
+        [posterData release];
         [fileName release];
         [movieTitle release];
@@ -187 +189 @@
         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];
@@ -202 +208 @@
         NSString *posterURL = [posters objectAtIndex:index];
         [posterLayers replaceObjectAtIndex:index withObject:[self getPosterLayerForData:nil]];
-        [[SapphireApplianceController urlLoader] loadDataURL:posterURL withTarget:self selector:@selector(reloadPosterWithData:atIndex:) object:[NSNumber numberWithInt:index] withPriority:YES];
-}
-
-- (void)reloadPosterWithData:(NSData *)data atIndex:(NSNumber *)index;
-{
-        int intIndex = [index intValue];
+        [[SapphireApplianceController urlLoader] loadDataURL:posterURL withTarget:self selector:@selector(gotPosterData:atIndex:) object:[NSNumber numberWithInt:index] withPriority:YES];
+}
+
+- (void)gotPosterData:(NSData *)data atIndex:(NSNumber *)index;
+{
+        if(displayed)
+                [self reloadPosterWithData:data atIndex:[index intValue]];
+        else
+                [posterData replaceObjectAtIndex:[index intValue] withObject:data];
+}
+
+- (void)reloadPosterWithData:(NSData *)data atIndex:(int)intIndex;
+{
         [posterLayers replaceObjectAtIndex:intIndex withObject:[self getPosterLayerForData:data]];
         NSImage *image = [[NSImage alloc] initWithData:data];
@@ -539 +552 @@
         [[self list] reload];
         [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];
+        }
 }