[vlc-commits] macosx: minor additions in optical media scanning code

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Sat Aug 25 22:01:08 2012 +0200| [f2ddc1ec6869185c00504b012e1a9003d9339247] | committer: David Fuhrmann

macosx: minor additions in optical media scanning code

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f2ddc1ec6869185c00504b012e1a9003d9339247
---

 modules/gui/macosx/open.h |    2 +-
 modules/gui/macosx/open.m |   15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/modules/gui/macosx/open.h b/modules/gui/macosx/open.h
index 37a39a1..3840d10 100644
--- a/modules/gui/macosx/open.h
+++ b/modules/gui/macosx/open.h
@@ -236,7 +236,7 @@
     id o_currentOpticalMediaView;
     id o_currentOpticalMediaIconView;
     NSMutableArray *o_allMediaDevices;
-    NSMutableArray *o_opticalDevices;
+    NSArray *o_opticalDevices;
     NSMutableArray *o_specialMediaFolders;
     NSString *o_file_path;
     id o_currentCaptureView;
diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m
index 22690b4..979e26d 100644
--- a/modules/gui/macosx/open.m
+++ b/modules/gui/macosx/open.m
@@ -96,7 +96,8 @@ static VLCOpen *_o_sharedMainInstance = nil;
 {
     [o_allMediaDevices release];
     [o_specialMediaFolders release];
-    [o_opticalDevices release];
+    if (o_opticalDevices)
+        [o_opticalDevices release];
     if( o_file_slave_path )
         [o_file_slave_path release];
     [o_mrl release];
@@ -321,7 +322,6 @@ static VLCOpen *_o_sharedMainInstance = nil;
     /* we want to be notified about removed or added media */
     o_allMediaDevices = [[NSMutableArray alloc] init];
     o_specialMediaFolders = [[NSMutableArray alloc] init];
-    o_opticalDevices = [[NSMutableArray alloc] init];
     o_displayInfos = [[NSMutableArray alloc] init];
     NSWorkspace *sharedWorkspace = [NSWorkspace sharedWorkspace];
 
@@ -1078,21 +1078,27 @@ static VLCOpen *_o_sharedMainInstance = nil;
 
 - (void)scanDevicesWithPaths:(NSArray *)o_paths
 {
+    NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
+
     NSUInteger count = [o_paths count];
     NSMutableArray *o_result = [NSMutableArray arrayWithCapacity:count];
     for (NSUInteger i = 0; i < count; i++)
         [o_result addObject: [self scanPath:[o_paths objectAtIndex:i]]];
 
     @synchronized (self) {
-        [o_opticalDevices removeAllObjects];
-        [o_opticalDevices addObjectsFromArray: o_result];
+        if (o_opticalDevices)
+            [o_opticalDevices release];
+        o_opticalDevices = [[NSArray alloc] initWithArray: o_result];
     }
 
     [self performSelectorOnMainThread:@selector(updateMediaSelector:) withObject:nil waitUntilDone:NO];
+    [o_pool release];
 }
 
 - (void)scanSpecialPath:(NSString *)o_path
 {
+    NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
+
     NSDictionary *o_dict = [self scanPath:o_path];
 
     @synchronized (self) {
@@ -1100,6 +1106,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
     }
 
     [self performSelectorOnMainThread:@selector(updateMediaSelector:) withObject:[NSNumber numberWithBool:YES] waitUntilDone:NO];
+    [o_pool release];
 }
 
 - (void)scanOpticalMedia:(NSNotification *)o_notification