Merge branch 'master' of ssh://git@git.videolan.org/vlc

projects/macosx/framework/Sources/VLCMedia.m

@@ -245,8 +245,7 @@ static void HandleMediaSubItemAdded(const libvlc_event_t * event, void * self)
     // Testing to see if the pointer exists is not required, if the pointer is null
     // then the release message is not sent to it.
     delegate = nil;
-    [self setLength:nil];
-
+    [length release];
     [url release];
     [subitems release];
     [metaDictionary release];
@@ -281,7 +280,7 @@ static void HandleMediaSubItemAdded(const libvlc_event_t * event, void * self)
         long long duration = libvlc_media_get_duration( p_md, NULL );
         if (duration > -1)
         {
-            [self setLength:[VLCTime timeWithNumber:[NSNumber numberWithLongLong:duration]]];
+            length = [[VLCTime timeWithNumber:[NSNumber numberWithLongLong:duration]] retain];
             return [[length retain] autorelease];
         }
         return [VLCTime nullTime];

projects/macosx/framework/Sources/VLCVideoView.m

@@ -185,26 +185,13 @@
     return stretchesVideo;
 }
 
-/* This is called by the libvlc module 'minimal_macosx' as soon as there is one 
+/* This is called by the libvlc module 'minimal_macosx' as soon as there is one
  * vout available
  */
 - (void)addVoutSubview:(NSView *)aView /* (Scheduled to deletion) */
 {
-    /* This is where the real video comes from */
-    if( [[self subviews] count] )
-    {
-        /* XXX: This is a hack until core gets fixed */
-        NSUInteger i;
-        for( i = 0; i < [[self subviews] count]; i++ )
-        {
-            [[[self subviews] objectAtIndex:i] detachFromVout];
-            [[[self subviews] objectAtIndex:i] retain];
-            [[[self subviews] objectAtIndex:i] removeFromSuperview];
-        }
-    }
-
     [aView setFrame:[self bounds]];
-    
+
     [self addSubview:aView];
 
     // TODO: Should we let the media player specify these values?