From: Pierre d'Herbemont <pdherbemont@free.fr>
Date: Fri, 29 Jan 2010 00:44:07 +0000 (+0100)
Subject: macosx/framework: Remove a bunch of exception.
X-Git-Tag: 1.1.0-ff~717
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=716537eb5a69c7b9263afdc4760ac446bf611a62;p=vlc

macosx/framework: Remove a bunch of exception.
---

diff --git a/projects/macosx/framework/Sources/VLCMediaLibrary.m b/projects/macosx/framework/Sources/VLCMediaLibrary.m
index 401f80eeff..ca6a1f165b 100644
--- a/projects/macosx/framework/Sources/VLCMediaLibrary.m
+++ b/projects/macosx/framework/Sources/VLCMediaLibrary.m
@@ -44,14 +44,13 @@
 {
     if (self = [super init])
     {
+        mlib = libvlc_media_library_new( [VLCLibrary sharedInstance]);
+
         libvlc_exception_t p_e;
         libvlc_exception_init( &p_e );
-        mlib = libvlc_media_library_new( [VLCLibrary sharedInstance], &p_e );
-        catch_exception( &p_e );
-        
         libvlc_media_library_load( mlib, &p_e );
         catch_exception( &p_e );
-        
+
         allMedia = nil;
     }
     return self;
@@ -60,10 +59,10 @@
 - (void)dealloc
 {
     [allMedia release];
-    
+
     libvlc_media_library_release(mlib);
     mlib = nil;     // make sure that the pointer is dead
-    
+
     [super dealloc];
 }
 
diff --git a/projects/macosx/framework/Sources/VLCMediaList.m b/projects/macosx/framework/Sources/VLCMediaList.m
index f9ed8f9642..03364e7b03 100644
--- a/projects/macosx/framework/Sources/VLCMediaList.m
+++ b/projects/macosx/framework/Sources/VLCMediaList.m
@@ -77,10 +77,7 @@ 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];
@@ -220,7 +217,7 @@ static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * use
     if( hierarchicalAspect )
         return hierarchicalAspect;
 
-    libvlc_media_list_view_t * p_mlv = libvlc_media_list_hierarchical_view( p_mlist, NULL );
+    libvlc_media_list_view_t * p_mlv = libvlc_media_list_hierarchical_view(p_mlist);
     hierarchicalAspect = [[VLCMediaListAspect mediaListAspectWithLibVLCMediaListView:p_mlv andMediaList:self] retain];
     libvlc_media_list_view_release( p_mlv );
     return hierarchicalAspect;
@@ -231,7 +228,7 @@ static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * use
     if( hierarchicalNodeAspect )
         return hierarchicalNodeAspect;
 
-    libvlc_media_list_view_t * p_mlv = libvlc_media_list_hierarchical_node_view( p_mlist, NULL );
+    libvlc_media_list_view_t * p_mlv = libvlc_media_list_hierarchical_node_view(p_mlist);
     hierarchicalNodeAspect = [[VLCMediaListAspect mediaListAspectWithLibVLCMediaListView:p_mlv andMediaList:self] retain];
     libvlc_media_list_view_release( p_mlv );
     return hierarchicalNodeAspect;
@@ -242,7 +239,7 @@ static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * use
     if( flatAspect )
         return flatAspect;
 
-    libvlc_media_list_view_t * p_mlv = libvlc_media_list_flat_view( p_mlist, NULL );
+    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;