Changeset 6fba236cbc4be069c84a70d81c0cbb8f46e9552b

Timestamp:

02/13/08 19:57:32 (6 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

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

git-parent:

[d206ed68debdf3b71866e730d6b494ed9b121be1]

git-author:

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

Message:

macosx/framework: Correctly set the children of the nodes.

Files:

• projects/macosx/framework/Sources/VLCMediaListAspect.m (modified) (6 diffs)

projects/macosx/framework/Sources/VLCMediaListAspect.m

@@ -44 +44 @@
-
-@implementation VLCMediaListAspectNode
+- (id)init
+{
+    if(self = [super init])
+    {
+        media = nil;
+        children = nil;        
+    }
+    return self;
+}
+- (void)dealloc
+{
+    [media release];
+    [children release];
+    [super dealloc];
+}
+
-@synthesize media;
-@synthesize children;
@@ -49 +65 @@
-- (BOOL)isLeaf
-{
-
-
-
-
-
-
-
-
+
+
+
-@end
-
@@ -114 +125 @@
-    [super dealloc];
-}
+
+- (void)release
+{
+    @synchronized(self)
+    {
+        if([self retainCount] <= 1)
+        {
+            /* We must make sure we won't receive new event after an upcoming dealloc
+             * We also may receive a -retain in some event callback that may occcur
+             * Before libvlc_event_detach. So this can't happen in dealloc */
+            libvlc_event_manager_t * p_em = libvlc_media_list_view_event_manager(p_mlv);
+            libvlc_event_detach(p_em, libvlc_MediaListViewItemDeleted, HandleMediaListViewItemDeleted, self, NULL);
+            libvlc_event_detach(p_em, libvlc_MediaListViewItemAdded,   HandleMediaListViewItemAdded,   self, NULL);
+        }
+        [super release];
+    }
+}
+
-- (NSString *)description
-{
@@ -156 +185 @@
-    VLCMediaListAspectNode * node = [[[VLCMediaListAspectNode alloc] init] autorelease];
-    [node setMedia:[self mediaAtIndex: index]];
+    libvlc_media_list_view_t * p_sub_mlv = libvlc_media_list_view_children_for_item([self libVLCMediaListView], [node.media libVLCMediaDescriptor], NULL);
+    if( p_sub_mlv )
+    {
+        [node setChildren:[VLCMediaListAspect mediaListAspectWithLibVLCMediaListView: p_sub_mlv]];
+        libvlc_media_list_view_release(p_sub_mlv);
+    }
-    return node;
-}
@@ -219 +254 @@
-            [node setMedia:[VLCMedia mediaWithLibVLCMediaDescriptor: p_md]];
-            [node setChildren: p_sub_mlv ? [VLCMediaListAspect mediaListAspectWithLibVLCMediaListView: p_sub_mlv] : nil];
+            if( p_sub_mlv ) NSAssert(![node isLeaf], @"Not leaf");
+
-            [cachedNode addObject:node];
-            libvlc_media_descriptor_release(p_md);
@@ -267 +304 @@
-        VLCMediaListAspectNode * node = [[[VLCMediaListAspectNode alloc] init] autorelease];
-        [node setMedia:media];
-
+
+
+
+
+
+
+
+
+
+
+
-        /* Sanity check */
-        if( index && index > [cachedNode count] )