]> git.sesse.net Git - vlc/commitdiff
use NSAutoreleasePool::drain instead of NSAutoreleasePool::release since VLCKit ist...
authorToralf Niebuhr <gmthor85@aim.com>
Thu, 22 Jul 2010 09:39:36 +0000 (11:39 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Thu, 22 Jul 2010 15:15:42 +0000 (17:15 +0200)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
projects/macosx/framework/Sources/VLCEventManager.m
projects/macosx/framework/Sources/VLCMedia.m
projects/macosx/framework/Sources/VLCMediaDiscoverer.m
projects/macosx/framework/Sources/VLCMediaList.m
projects/macosx/framework/Sources/VLCMediaPlayer.m

index 81013ca8eb39f6fee5476709f9fe82344323393d..b810b24686d9c6b00060094f4c52efb38ae7a18e 100644 (file)
@@ -155,7 +155,7 @@ static void * EventDispatcherMainLoop(void * user_data)
                                    withObject:dataMessage
                                 waitUntilDone: YES];
 
-        [pool release];
+        [pool drain];
     }
     return nil;
 }
@@ -231,7 +231,7 @@ static void * EventDispatcherMainLoop(void * user_data)
         pthread_mutex_unlock( [self queueLock] );
     }
     
-    [pool release];
+    [pool drain];
 }
 
 - (void)callOnMainThreadObject:(id)aTarget withMethod:(SEL)aSelector withArgumentAsObject: (id)arg
@@ -250,7 +250,7 @@ static void * EventDispatcherMainLoop(void * user_data)
     pthread_cond_signal( [self signalData] );
     pthread_mutex_unlock( [self queueLock] );
     
-    [pool release];
+    [pool drain];
 }
 @end
 
index 8d0d20324ea3b115559d4f03a6e8c6085b212006..6295611433eb624e2266de7c780ffc8ce7aa15c7 100644 (file)
@@ -115,7 +115,7 @@ static void HandleMediaMetaChanged(const libvlc_event_t * event, void * self)
     [[VLCEventManager sharedManager] callOnMainThreadObject:self
                                                  withMethod:@selector(metaChanged:)
                                        withArgumentAsObject:[VLCMedia metaTypeToString:event->u.media_meta_changed.meta_type]];
-    [pool release];
+    [pool drain];
 }
 
 static void HandleMediaDurationChanged(const libvlc_event_t * event, void * self)
@@ -126,7 +126,7 @@ static void HandleMediaDurationChanged(const libvlc_event_t * event, void * self
                                                  withMethod:@selector(setLength:)
                                        withArgumentAsObject:[VLCTime timeWithNumber:
                                            [NSNumber numberWithLongLong:event->u.media_duration_changed.new_duration]]];
-    [pool release];
+    [pool drain];
 }
 
 static void HandleMediaStateChanged(const libvlc_event_t * event, void * self)
@@ -137,7 +137,7 @@ static void HandleMediaStateChanged(const libvlc_event_t * event, void * self)
                                                  withMethod:@selector(setStateAsNumber:)
                                        withArgumentAsObject:[NSNumber numberWithInt:
                                             LibVLCStateToMediaState(event->u.media_state_changed.new_state)]];
-    [pool release];
+    [pool drain];
 }
 
 static void HandleMediaSubItemAdded(const libvlc_event_t * event, void * self)
@@ -146,7 +146,7 @@ static void HandleMediaSubItemAdded(const libvlc_event_t * event, void * self)
     [[VLCEventManager sharedManager] callOnMainThreadObject:self
                                                  withMethod:@selector(subItemAdded)
                                        withArgumentAsObject:nil];
-    [pool release];
+    [pool drain];
 }
 
 /******************************************************************************
index 02b9ce9a204d385a3fe54d37000398c5ab3c56c7..162435e1aca8298323a49cb18fb4b253d03e2f9b 100644 (file)
@@ -55,7 +55,7 @@ static void HandleMediaDiscovererStarted(const libvlc_event_t * event, void * us
     [[VLCEventManager sharedManager] callOnMainThreadObject:self
                                                  withMethod:@selector(mediaDiscovererStarted)
                                        withArgumentAsObject:nil];
-    [pool release];
+    [pool drain];
 }
 
 static void HandleMediaDiscovererEnded( const libvlc_event_t * event, void * user_data)
@@ -65,7 +65,7 @@ static void HandleMediaDiscovererEnded( const libvlc_event_t * event, void * use
     [[VLCEventManager sharedManager] callOnMainThreadObject:self
                                                  withMethod:@selector(mediaDiscovererEnded)
                                        withArgumentAsObject:nil];
-    [pool release];
+    [pool drain];
 }
 
 
index c2f68e7fa7deba93d7e206cfe51910bedd8244bf..847ad44bdf745ab51841d2782badeab5413069d5 100644 (file)
@@ -58,7 +58,7 @@ static void HandleMediaListItemAdded(const libvlc_event_t * event, void * user_d
                                                           [VLCMedia mediaWithLibVLCMediaDescriptor:event->u.media_list_item_added.item], @"media",
                                                           [NSNumber numberWithInt:event->u.media_list_item_added.index], @"index",
                                                           nil]]];
-    [pool release];
+    [pool drain];
 }
 
 static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * user_data)
@@ -68,7 +68,7 @@ static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * use
     [[VLCEventManager sharedManager] callOnMainThreadObject:self
                                                  withMethod:@selector(mediaListItemRemoved:)
                                        withArgumentAsObject:[NSNumber numberWithInt:event->u.media_list_item_deleted.index]];
-    [pool release];
+    [pool drain];
 }
 
 @implementation VLCMediaList
index 44bddacc264afcba5f3374816a436d6aa0d1c95b..a50333b1eef0bb1addeea92eadd7b57983ce1db8 100644 (file)
@@ -79,7 +79,7 @@ static void HandleMediaTimeChanged(const libvlc_event_t * event, void * self)
     [[VLCEventManager sharedManager] callOnMainThreadDelegateOfObject:self
                                                    withDelegateMethod:@selector(mediaPlayerTimeChanged:)
                                                  withNotificationName:VLCMediaPlayerTimeChanged];
-    [pool release];
+    [pool drain];
 }
 
 static void HandleMediaPositionChanged(const libvlc_event_t * event, void * self)
@@ -89,7 +89,7 @@ static void HandleMediaPositionChanged(const libvlc_event_t * event, void * self
     [[VLCEventManager sharedManager] callOnMainThreadObject:self
                                                  withMethod:@selector(mediaPlayerPositionChanged:)
                                        withArgumentAsObject:[NSNumber numberWithFloat:event->u.media_player_position_changed.new_position]];
-    [pool release];
+    [pool drain];
 }
 
 static void HandleMediaInstanceStateChanged(const libvlc_event_t * event, void * self)
@@ -120,7 +120,7 @@ static void HandleMediaInstanceStateChanged(const libvlc_event_t * event, void *
                                                    withDelegateMethod:@selector(mediaPlayerStateChanged:)
                                                  withNotificationName:VLCMediaPlayerStateChanged];
 
-    [pool release];
+    [pool drain];
 
 }
 
@@ -132,7 +132,7 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
                                                  withMethod:@selector(mediaPlayerMediaChanged:)
                                        withArgumentAsObject:[VLCMedia mediaWithLibVLCMediaDescriptor:event->u.media_player_media_changed.new_media]];
 
-    [pool release];
+    [pool drain];
 
 }