macosx/framework: Get rid of VLCMediaListAspect, and remove a bunch of exception.

[vlc] / projects / macosx / framework / Sources / VLCMediaList.m

diff --git a/projects/macosx/framework/Sources/VLCMediaList.m b/projects/macosx/framework/Sources/VLCMediaList.m
index bc2ecd4c94b129c7ac027c9fd26ad94399634b17..6001be0742e223a5b6921196bff47620b75ceb44 100644 (file)
--- a/projects/macosx/framework/Sources/VLCMediaList.m
+++ b/projects/macosx/framework/Sources/VLCMediaList.m
@@ -52,8 +52,8 @@ static void HandleMediaListItemAdded(const libvlc_event_t * event, void * user_d
 {
     NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
     id self = user_data;
-    [[VLCEventManager sharedManager] callOnMainThreadObject:self 
-                                                 withMethod:@selector(mediaListItemAdded:) 
+    [[VLCEventManager sharedManager] callOnMainThreadObject:self
+                                                 withMethod:@selector(mediaListItemAdded:)
                                        withArgumentAsObject:[NSArray arrayWithObject:[NSDictionary dictionaryWithObjectsAndKeys:
                                                           [VLCMedia mediaWithLibVLCMediaDescriptor:event->u.media_list_item_added.item], @"media",
                                                           [NSNumber numberWithInt:event->u.media_list_item_added.index], @"index",
@@ -65,8 +65,8 @@ static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * use
 {
     NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
     id self = user_data;
-    [[VLCEventManager sharedManager] callOnMainThreadObject:self 
-                                                 withMethod:@selector(mediaListItemRemoved:) 
+    [[VLCEventManager sharedManager] callOnMainThreadObject:self
+                                                 withMethod:@selector(mediaListItemRemoved:)
                                        withArgumentAsObject:[NSNumber numberWithInt:event->u.media_list_item_deleted.index]];
     [pool release];
 }
@@ -77,14 +77,10 @@ static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * use
     if (self = [super init])
     {
         // Create a new libvlc media list instance
-        libvlc_exception_t p_e;
-        libvlc_exception_init( &p_e );
-        p_mlist = libvlc_media_list_new( [VLCLibrary sharedInstance], &p_e );
-        catch_exception( &p_e );
-        
+        p_mlist = libvlc_media_list_new([VLCLibrary sharedInstance]);
+
         // Initialize internals to defaults
         cachedMedia = [[NSMutableArray alloc] init];
-        delegate = flatAspect = hierarchicalAspect = hierarchicalNodeAspect = nil;
         [self initInternalMediaList];
     }
     return self;
@@ -99,9 +95,9 @@ static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * use
             /* 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_event_manager(p_mlist, NULL);
-            libvlc_event_detach(p_em, libvlc_MediaListItemDeleted, HandleMediaListItemDeleted, self, NULL);
-            libvlc_event_detach(p_em, libvlc_MediaListItemAdded,   HandleMediaListItemAdded,   self, NULL);
+            libvlc_event_manager_t * p_em = libvlc_media_list_event_manager(p_mlist);
+            libvlc_event_detach(p_em, libvlc_MediaListItemDeleted, HandleMediaListItemDeleted, self);
+            libvlc_event_detach(p_em, libvlc_MediaListItemAdded,   HandleMediaListItemAdded,   self);
         }
         [super release];
     }
@@ -111,12 +107,9 @@ static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * use
 {
     // Release allocated memory
     delegate = nil;
-    
+
     libvlc_media_list_release( p_mlist );
     [cachedMedia release];
-    [flatAspect release];
-    [hierarchicalAspect release];
-    [hierarchicalNodeAspect release];
     [super dealloc];
 }
 
@@ -177,11 +170,7 @@ static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * use
 
 - (NSInteger)indexOfMedia:(VLCMedia *)media
 {
-    libvlc_exception_t p_e;
-    libvlc_exception_init( &p_e );
-    NSInteger result = libvlc_media_list_index_of_item( p_mlist, [media libVLCMediaDescriptor], &p_e );
-    catch_exception( &p_e );
-    
+    NSInteger result = libvlc_media_list_index_of_item(p_mlist, [media libVLCMediaDescriptor]);
     return result;
 }
 
@@ -191,7 +180,7 @@ static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * use
     return [self count];
 }
 
-- (id)objectInMediaAtIndex:(NSInteger)i
+- (id)objectInMediaAtIndex:(NSUInteger)i
 {
     return [self mediaAtIndex:i];
 }
@@ -201,50 +190,21 @@ static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * use
     return [cachedMedia count];
 }
 
-@synthesize delegate;
-
-- (BOOL)isReadOnly
+- (void)insertObject:(id)object inMediaAtIndex:(NSUInteger)i
 {
-    libvlc_exception_t p_e;
-    libvlc_exception_init( &p_e );
-    BOOL isReadOnly = libvlc_media_list_is_readonly( p_mlist );
-    catch_exception( &p_e );
-    
-    return isReadOnly;
+    [self insertMedia:object atIndex:i];
 }
 
-/* Media list aspect */
-- (VLCMediaListAspect *)hierarchicalAspect
+- (void)removeObjectFromMediaAtIndex:(NSUInteger)i
 {
-    if( hierarchicalAspect )
-        return hierarchicalAspect;
-    
-    libvlc_media_list_view_t * p_mlv = libvlc_media_list_hierarchical_view( p_mlist, NULL );
-    hierarchicalAspect = [[VLCMediaListAspect mediaListAspectWithLibVLCMediaListView:p_mlv andMediaList:self] retain];
-    libvlc_media_list_view_release( p_mlv );
-    return hierarchicalAspect;
+    [self removeMediaAtIndex:i];
 }
 
-- (VLCMediaListAspect *)hierarchicalNodeAspect
-{
-    if( hierarchicalNodeAspect )
-        return hierarchicalNodeAspect;
-    
-    libvlc_media_list_view_t * p_mlv = libvlc_media_list_hierarchical_node_view( p_mlist, NULL );
-    hierarchicalNodeAspect = [[VLCMediaListAspect mediaListAspectWithLibVLCMediaListView:p_mlv andMediaList:self] retain];
-    libvlc_media_list_view_release( p_mlv );
-    return hierarchicalNodeAspect;
-}
+@synthesize delegate;
 
-- (VLCMediaListAspect *)flatAspect
+- (BOOL)isReadOnly
 {
-    if( flatAspect )
-        return flatAspect;
-    
-    libvlc_media_list_view_t * p_mlv = libvlc_media_list_flat_view( p_mlist, NULL );
-    flatAspect = [[VLCMediaListAspect mediaListAspectWithLibVLCMediaListView:p_mlv andMediaList:self] retain];
-    libvlc_media_list_view_release( p_mlv );
-    return flatAspect;
+    return libvlc_media_list_is_readonly( p_mlist );
 }
 
 @end
@@ -262,9 +222,9 @@ static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * use
         p_mlist = p_new_mlist;
         libvlc_media_list_retain( p_mlist );
         libvlc_media_list_lock( p_mlist );
-        cachedMedia = [[NSMutableArray alloc] initWithCapacity:libvlc_media_list_count( p_mlist, NULL )];
+        cachedMedia = [[NSMutableArray alloc] initWithCapacity:libvlc_media_list_count(p_mlist)];
 
-        NSUInteger i, count = libvlc_media_list_count( p_mlist, NULL );
+        NSUInteger i, count = libvlc_media_list_count(p_mlist);
         for( i = 0; i < count; i++ )
         {
             libvlc_media_t * p_md = libvlc_media_list_item_at_index( p_mlist, i, NULL );
@@ -287,14 +247,9 @@ static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * use
 - (void)initInternalMediaList
 {
     // Add event callbacks
-    libvlc_exception_t p_e;
-    libvlc_exception_init( &p_e );
-
-    libvlc_event_manager_t * p_em = libvlc_media_list_event_manager( p_mlist, &p_e );
-    libvlc_event_attach( p_em, libvlc_MediaListItemAdded,   HandleMediaListItemAdded,   self, &p_e );
-    libvlc_event_attach( p_em, libvlc_MediaListItemDeleted, HandleMediaListItemDeleted, self, &p_e );
-    
-    catch_exception( &p_e );
+    libvlc_event_manager_t * p_em = libvlc_media_list_event_manager(p_mlist);
+    libvlc_event_attach( p_em, libvlc_MediaListItemAdded,   HandleMediaListItemAdded,   self);
+    libvlc_event_attach( p_em, libvlc_MediaListItemDeleted, HandleMediaListItemDeleted, self);
 }
 
 - (void)mediaListItemAdded:(NSArray *)arrayOfArgs
@@ -333,7 +288,7 @@ static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * use
     [self didChange:NSKeyValueChangeInsertion valuesAtIndexes:[NSIndexSet indexSetWithIndex:[index intValue]] forKey:@"media"];
 
     // Post the notification
-    [[NSNotificationCenter defaultCenter] postNotificationName:VLCMediaListItemDeleted 
+    [[NSNotificationCenter defaultCenter] postNotificationName:VLCMediaListItemDeleted
                                                         object:self
                                                       userInfo:[NSDictionary dictionaryWithObjectsAndKeys:
                                                           index, @"index",