Changeset 4a19225407971ebbbd26840072d62ededc782d0e

Timestamp:

02/16/08 01:33:48 (5 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1203122028 +0000

git-parent:

[c6f9a67d3f6741518abff10e1ea22f8dc984b7b1]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1203122028 +0000

Message:

macosx/framework: Only fetch meta when needed.

Files:

• projects/macosx/framework/Headers/Public/VLCMedia.h (modified) (1 diff)
• projects/macosx/framework/Sources/VLCMedia.m (modified) (3 diffs)

projects/macosx/framework/Headers/Public/VLCMedia.h

@@ -114 +114 @@
-    NSMutableDictionary * metaDictionary;    //< Meta data storage
-    id                    delegate;          //< Delegate object
-preparsed;         //< Value used to determine of the file
+artFetched;        //< Value used to determine of the artwork
-    VLCMediaState         state;
-}

projects/macosx/framework/Sources/VLCMedia.m

@@ -431 +431 @@
-    libvlc_exception_init( &ex );
-
+    artFetched = NO;
+
-    char * p_url = libvlc_media_descriptor_get_mrl( p_md, &ex );
-    catch_exception( &ex );
@@ -464 +466 @@
-     * And all the other meta will be added through the libvlc event system */
-    [self fetchMetaInformationFromLibVLCWithType: VLCMetaInformationTitle];
-
-    /* Force VLCMetaInformationArtworkURL, that will trigger artwork fetching */
-    [self fetchMetaInformationFromLibVLCWithType: VLCMetaInformationArtworkURL];
-}
-
@@ -546 +545 @@
-    [self setState: [newStateAsNumber intValue]];
-}
+
+- (id)valueForKeyPath:(NSString *)keyPath
+{
+    if( ![metaDictionary objectForKey:@"artwork"] && [keyPath isEqualToString:@"metaDictionary.artwork"])
+    {
+        artFetched = YES;
+        /* Force the retrieval of the artwork now that someone asked for it */
+        [self fetchMetaInformationFromLibVLCWithType: VLCMetaInformationArtworkURL];
+    }
+    return [super valueForKeyPath:keyPath];
+}
-@end
-