Changeset 1b26ff77b0fd9ea5d713c7acd52259e6c68efbf5

Timestamp:

30/12/07 02:50:14 (9 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

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

git-parent:

[0d4609bfb9bdb1900613263ac66b354dd3bf754a]

git-author:

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

Message:

MacOSX/Framework/VLCMedia.m: Update the subitems on sub item additions.

Files:

• extras/MacOSX/Framework/Sources/VLCMedia.m (modified) (6 diffs)

extras/MacOSX/Framework/Sources/VLCMedia.m

@@ -71 +71 @@
-/* Callback Methods */
-- (void)metaChanged:(NSString *)metaType;
+- (void)subItemAdded;
-@end
-
@@ -123 +124 @@
-}
-
+static void HandleMediaSubItemAdded(const libvlc_event_t *event, void *self)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    [[VLCEventManager sharedManager] callOnMainThreadObject:self
+                                                 withMethod:@selector(subItemAdded)
+                                       withArgumentAsObject:nil];
+    [pool release];
+}
+
-/******************************************************************************
- * Implementation
@@ -207 +217 @@
-            libvlc_event_detach(p_em, libvlc_MediaDescriptorDurationChanged, HandleMediaDurationChanged, self, NULL);
-            libvlc_event_detach(p_em, libvlc_MediaDescriptorStateChanged,    HandleMediaStateChanged,    self, NULL);
+            libvlc_event_detach(p_em, libvlc_MediaDescriptorSubItemAdded,    HandleMediaSubItemAdded,    self, NULL);
-        }
-        [super release];
@@ -428 +439 @@
-    libvlc_event_attach(p_em, libvlc_MediaDescriptorDurationChanged, HandleMediaDurationChanged, self, &ex);
-    libvlc_event_attach(p_em, libvlc_MediaDescriptorStateChanged,    HandleMediaStateChanged,    self, &ex);
+    libvlc_event_attach(p_em, libvlc_MediaDescriptorSubItemAdded,    HandleMediaSubItemAdded,    self, &ex);
-    quit_on_exception( &ex );
-    
@@ -439 +451 @@
-        libvlc_media_list_release( p_mlist );
-    }
+
-    state = LibVLCStateToMediaState(libvlc_media_descriptor_get_state( p_md, NULL ));
-    /* Force VLCMetaInformationTitle, that will trigger preparsing
@@ -490 +503 @@
-    [self fetchMetaInformationFromLibVLCWithType:metaType];
-}
+
+- (void)subItemAdded
+{
+    if( subitems )
+        return; /* Nothing to do */
+
+    libvlc_media_list_t *p_mlist = libvlc_media_descriptor_subitems( p_md, NULL );
+
+    NSAssert( p_mlist, @"The mlist shouldn't be nil, we are receiving a subItemAdded");
+
+    [self willChangeValueForKey:@"subitems"];
+    subitems = [[VLCMediaList mediaListWithLibVLCMediaList:p_mlist] retain];
+    [self didChangeValueForKey:@"subitems"];
+    libvlc_media_list_release( p_mlist );
+}
-@end
-