X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fplaylistinfo.m;h=a818f3f6e420edfb403b830509da419938c868c0;hb=76a07e86ea5b16e3be567e19b58012de79ae64e0;hp=e94504dec7a94131820707a70b03b90fba7af4b7;hpb=9a746cfa3078c53eed57d2102002b39c283c6ab4;p=vlc

diff --git a/modules/gui/macosx/playlistinfo.m b/modules/gui/macosx/playlistinfo.m
index e94504dec7..a818f3f6e4 100644
--- a/modules/gui/macosx/playlistinfo.m
+++ b/modules/gui/macosx/playlistinfo.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  r playlistinfo.m: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2009 the VideoLAN team
+ * Copyright (C) 2002-2012 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Benjamin Pracht <bigben at videolan dot org>
@@ -26,10 +26,11 @@
  * Preamble
  *****************************************************************************/
 
-#include "intf.h"
-#include "playlistinfo.h"
-#include "playlist.h"
-#include <vlc_url.h>
+#import "CompatibilityFixes.h"
+#import "intf.h"
+#import "playlistinfo.h"
+#import "playlist.h"
+#import <vlc_url.h>
 
 /*****************************************************************************
  * VLCPlaylistInfo Implementation
@@ -46,18 +47,13 @@ static VLCInfo *_o_sharedInstance = nil;
 
 - (id)init
 {
-    if( _o_sharedInstance )
-    {
+    if (_o_sharedInstance)
         [self dealloc];
-    }
-    else
-    {
+    else {
         _o_sharedInstance = [super init];
-        
-        if( _o_sharedInstance != nil )
-        {
+
+        if (_o_sharedInstance != nil) {
             p_item = NULL;
-            o_statUpdateTimer = nil;
             [self updatePanelWithItem: NULL];
             rootItem = [[VLCInfoTreeItem alloc] init];
         }
@@ -70,12 +66,14 @@ static VLCInfo *_o_sharedInstance = nil;
 {
     [o_info_window setExcludedFromWindowsMenu: YES];
     [o_info_window setFloatingPanel: NO];
+    if (!OSX_SNOW_LEOPARD)
+        [o_info_window setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary];
 
     [o_info_window setTitle: _NS("Media Information")];
     [o_uri_lbl setStringValue: _NS("Location")];
     [o_title_lbl setStringValue: _NS("Title")];
     [o_author_lbl setStringValue: _NS("Artist")];
-    [o_saveMetaData_btn setStringValue: _NS("Save Metadata" )];
+    [o_saveMetaData_btn setStringValue: _NS("Save Metadata")];
 
     [[o_tab_view tabViewItemAtIndex: 0] setLabel: _NS("General")];
     [[o_tab_view tabViewItemAtIndex: 1] setLabel: _NS("Codec Details")];
@@ -92,26 +90,26 @@ static VLCInfo *_o_sharedInstance = nil;
     [o_language_lbl setStringValue: _NS(VLC_META_LANGUAGE)];
     [o_nowPlaying_lbl setStringValue: _NS(VLC_META_NOW_PLAYING)];
     [o_publisher_lbl setStringValue: _NS(VLC_META_PUBLISHER)];
+    [o_encodedby_lbl setStringValue: _NS(VLC_META_ENCODED_BY)];
 
     /* statistics */
-    [o_input_box setTitle: _NS("Input")];
+    [o_input_lbl setStringValue: _NS("Input")];
     [o_read_bytes_lbl setStringValue: _NS("Read at media")];
     [o_input_bitrate_lbl setStringValue: _NS("Input bitrate")];
     [o_demux_bytes_lbl setStringValue: _NS("Demuxed")];
     [o_demux_bitrate_lbl setStringValue: _NS("Stream bitrate")];
 
-    [o_video_box setTitle: _NS("Video")];
+    [o_video_lbl setStringValue: _NS("Video")];
     [o_video_decoded_lbl setStringValue: _NS("Decoded blocks")];
     [o_displayed_lbl setStringValue: _NS("Displayed frames")];
     [o_lost_frames_lbl setStringValue: _NS("Lost frames")];
-	[o_fps_lbl setStringValue: _NS("Frames per Second")];
 
-    [o_sout_box setTitle: _NS("Streaming")];
+    [o_sout_lbl setStringValue: _NS("Streaming")];
     [o_sent_packets_lbl setStringValue: _NS("Sent packets")];
     [o_sent_bytes_lbl setStringValue: _NS("Sent bytes")];
     [o_sent_bitrate_lbl setStringValue: _NS("Send rate")];
 
-    [o_audio_box setTitle: _NS("Audio")];
+    [o_audio_lbl setStringValue: _NS("Audio")];
     [o_audio_decoded_lbl setStringValue: _NS("Decoded blocks")];
     [o_played_abuffers_lbl setStringValue: _NS("Played buffers")];
     [o_lost_abuffers_lbl setStringValue: _NS("Lost buffers")];
@@ -119,96 +117,61 @@ static VLCInfo *_o_sharedInstance = nil;
     [o_info_window setInitialFirstResponder: o_uri_txt];
     [o_info_window setDelegate: self];
 
+    b_awakeFromNib = YES;
+
     /* We may be awoken from nib way after initialisation
      * Update ourselves */
     [self updatePanelWithItem:p_item];
 }
 
-- (void)stopTimers
-{
-    /* make sure that the timer is released in any case */
-    if( o_statUpdateTimer && [o_statUpdateTimer isValid] )
-        [o_statUpdateTimer invalidate];
-
-    [rootItem release];
-
-    [o_statUpdateTimer release];
-    o_statUpdateTimer = nil;
-}
 
 - (void)dealloc
 {
-    /* make sure that the timer is released in any case */
-    if( o_statUpdateTimer && [o_statUpdateTimer isValid] )
-        [o_statUpdateTimer invalidate];
-
-    [o_statUpdateTimer release];
+    [rootItem release];
 
-    if( p_item ) vlc_gc_decref( p_item );
+    if (p_item)
+        vlc_gc_decref(p_item);
 
     [super dealloc];
 }
 
-- (void)windowDidBecomeKey:(NSNotification *)notification
-{
-    BOOL b_stats = config_GetInt(VLCIntf, "stats");
-    if( b_stats )
-    {
-        if( o_statUpdateTimer )
-        {
-            [o_statUpdateTimer invalidate];
-            [o_statUpdateTimer release];
-            o_statUpdateTimer = nil;
-        }
-        o_statUpdateTimer = [NSTimer scheduledTimerWithTimeInterval: 1
-            target: self selector: @selector(updateStatistics:)
-            userInfo: nil repeats: YES];
-        [o_statUpdateTimer fire];
-        [o_statUpdateTimer retain];
-    }
-}
-
-- (BOOL)windowShouldClose:(id)sender
+- (void)updateCocoaWindowLevel:(NSInteger)i_level
 {
-    if( [o_statUpdateTimer isValid] )
-        [o_statUpdateTimer invalidate];
-
-    if( o_statUpdateTimer )
-        [o_statUpdateTimer release];
-    o_statUpdateTimer = nil;
-    return YES;
+    if (o_info_window && [o_info_window isVisible] && [o_info_window level] != i_level)
+        [o_info_window setLevel: i_level];
 }
 
 - (void)initPanel
 {
-    BOOL b_stats = config_GetInt(VLCIntf, "stats");
-    if( !b_stats )
-    {
-        if( [o_tab_view numberOfTabViewItems] > 2 )
+    b_stats = var_InheritBool(VLCIntf, "stats");
+    if (!b_stats) {
+        if ([o_tab_view numberOfTabViewItems] > 2)
             [o_tab_view removeTabViewItem: [o_tab_view tabViewItemAtIndex: 2]];
     }
+    else
+        [self initMediaPanelStats];
 
-    [self initMediaPanelStats];
+    NSInteger i_level = [[[VLCMain sharedInstance] voutController] currentWindowLevel];
+    [o_info_window setLevel: i_level];
     [o_info_window makeKeyAndOrderFront: self];
 }
 
 - (void)initMediaPanelStats
 {
     //Initializing Input Variables
-    [o_read_bytes_txt setStringValue: [NSString stringWithFormat:@"%8.0f kB", (float)0]];
+    [o_read_bytes_txt setStringValue: [NSString stringWithFormat:_NS("%.1f KiB"), (float)0]];
     [o_input_bitrate_txt setStringValue: [NSString stringWithFormat:@"%6.0f kb/s", (float)0]];
-    [o_demux_bytes_txt setStringValue: [NSString stringWithFormat:@"%8.0f kB", (float)0]];
+    [o_demux_bytes_txt setStringValue: [NSString stringWithFormat:_NS("%.1f KiB"), (float)0]];
     [o_demux_bitrate_txt setStringValue: [NSString stringWithFormat:@"%6.0f kb/s", (float)0]];
-    
+
     //Initializing Video Variables
     [o_video_decoded_txt setIntValue:0];
     [o_displayed_txt setIntValue:0];
     [o_lost_frames_txt setIntValue:0];
-    [o_fps_txt setFloatValue:0];
 
     //Initializing Output Variables
     [o_sent_packets_txt setIntValue: 0];
-    [o_sent_bytes_txt setStringValue: [NSString stringWithFormat:@"%8.0f kB", (float)0]];
+    [o_sent_bytes_txt setStringValue: [NSString stringWithFormat:_NS("%.1f KiB"), (float)0]];
     [o_sent_bitrate_txt setStringValue: [NSString stringWithFormat:@"%6.0f kb/s", (float)0]];
 
     //Initializing Audio Variables
@@ -220,16 +183,15 @@ static VLCInfo *_o_sharedInstance = nil;
 
 - (void)updatePanelWithItem:(input_item_t *)_p_item;
 {
-    if( _p_item != p_item )
-    {
-        if( p_item ) vlc_gc_decref( p_item );
+    NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
+    if (_p_item != p_item) {
+        if (p_item) vlc_gc_decref(p_item);
         [o_saveMetaData_btn setEnabled: NO];
-        if( _p_item ) vlc_gc_incref( _p_item );
+        if (_p_item) vlc_gc_incref(_p_item);
         p_item = _p_item;
     }
 
-    if( !p_item )
-    {
+    if (!p_item) {
         /* Erase */
     #define SET( foo ) \
         [self setMeta: "" forLabel: o_##foo##_txt];
@@ -245,29 +207,24 @@ static VLCInfo *_o_sharedInstance = nil;
         SET( language );
         SET( date );
         SET( description );
+        SET( encodedby );
     #undef SET
         [o_image_well setImage: [NSImage imageNamed: @"noart.png"]];
-    }
-    else
-    {
-        if( !input_item_IsPreparsed( p_item ) )
-        {
-            playlist_t * p_playlist = pl_Hold( VLCIntf );
-            playlist_PreparseEnqueue( p_playlist, p_item, pl_Unlocked );
-            pl_Release( VLCIntf );
-        }
+    } else {
+        if (!input_item_IsPreparsed(p_item))
+            libvlc_MetaRequest(VLCIntf->p_libvlc, p_item);
 
         /* fill uri info */
-        char * psz_url = input_item_GetURI( p_item );
-        [o_uri_txt setStringValue: [NSString stringWithUTF8String: psz_url ? psz_url : ""  ]];
-        free( psz_url );
+        char * psz_url = decode_URI(input_item_GetURI(p_item));
+        [o_uri_txt setStringValue: [NSString stringWithUTF8String:psz_url ? psz_url : ""]];
+        free(psz_url);
 
         /* fill title info */
-        char * psz_title = input_item_GetTitle( p_item );
-        if( !psz_title )
-            psz_title = input_item_GetName( p_item );
-        [o_title_txt setStringValue: [NSString stringWithUTF8String: psz_title ? : ""  ]];
-        free( psz_title );
+        char * psz_title = input_item_GetTitle(p_item);
+        if (!psz_title)
+            psz_title = input_item_GetName(p_item);
+        [o_title_txt setStringValue: [NSString stringWithUTF8String:psz_title ? : ""]];
+        free(psz_title);
 
     #define SET( foo, bar ) \
         char *psz_##foo = input_item_Get##bar ( p_item ); \
@@ -285,78 +242,84 @@ static VLCInfo *_o_sharedInstance = nil;
         SET( language, Language );
         SET( date, Date );
         SET( description, Description );
+        SET( encodedby, EncodedBy );
 
     #undef SET
 
         char *psz_meta;
         NSImage *o_image;
-        psz_meta = input_item_GetArtURL( p_item );
-        if( psz_meta && !strncmp( psz_meta, "file://", 7 ) && decode_URI( psz_meta + 7 ) )
-            o_image = [[NSImage alloc] initWithContentsOfFile: [NSString stringWithUTF8String: psz_meta+7]];
+        psz_meta = input_item_GetArtURL(p_item);
+
+        /* FIXME Can also be attachment:// */
+        if (psz_meta && strncmp(psz_meta, "attachment://", 13))
+            o_image = [[NSImage alloc] initWithContentsOfURL: [NSURL URLWithString:[NSString stringWithUTF8String:psz_meta]]];
         else
             o_image = [[NSImage imageNamed: @"noart.png"] retain];
         [o_image_well setImage: o_image];
         [o_image release];
-        FREENULL( psz_meta );
+        FREENULL(psz_meta);
     }
 
     /* reload the advanced table */
     [rootItem refresh];
     [o_outline_view reloadData];
+    [o_outline_view expandItem:nil expandChildren:YES];
 
     /* update the stats once to display p_item change faster */
-    [self updateStatistics: nil];
+    [self updateStatistics];
+    [o_pool release];
 }
 
 - (void)setMeta: (char *)psz_meta forLabel: (id)theItem
 {
-    if( psz_meta != NULL && *psz_meta)
+    if (psz_meta != NULL && *psz_meta)
         [theItem setStringValue: [NSString stringWithUTF8String:psz_meta]];
     else
         [theItem setStringValue: @""];
 }
 
-- (void)updateStatistics:(NSTimer*)theTimer
+- (void)updateStatistics
 {
-    if( !p_item || !p_item->p_stats )
-    {
-        [self initMediaPanelStats];
+    if (!b_awakeFromNib || !b_stats)
         return;
-    }
 
-    vlc_mutex_lock( &p_item->p_stats->lock );
-
-    /* input */
-    [o_read_bytes_txt setStringValue: [NSString stringWithFormat:
-        @"%8.0f kB", (float)(p_item->p_stats->i_read_bytes)/1000]];
-    [o_input_bitrate_txt setStringValue: [NSString stringWithFormat:
-        @"%6.0f kb/s", (float)(p_item->p_stats->f_input_bitrate)*8000]];
-    [o_demux_bytes_txt setStringValue: [NSString stringWithFormat:
-        @"%8.0f kB", (float)(p_item->p_stats->i_demux_read_bytes)/1000]];
-    [o_demux_bitrate_txt setStringValue: [NSString stringWithFormat:
-        @"%6.0f kb/s", (float)(p_item->p_stats->f_demux_bitrate)*8000]];
-
-    /* Video */
-    [o_video_decoded_txt setIntValue: p_item->p_stats->i_decoded_video];
-    [o_displayed_txt setIntValue: p_item->p_stats->i_displayed_pictures];
-    [o_lost_frames_txt setIntValue: p_item->p_stats->i_lost_pictures];
-    float f_fps = 0;
-    /* FIXME: input_Control( p_item, INPUT_GET_VIDEO_FPS, &f_fps ); */
-    [o_fps_txt setFloatValue: f_fps];
-
-    /* Sout */
-    [o_sent_packets_txt setIntValue: p_item->p_stats->i_sent_packets];
-    [o_sent_bytes_txt setStringValue: [NSString stringWithFormat: @"%8.0f kB",
-        (float)(p_item->p_stats->i_sent_bytes)/1000]];
-    [o_sent_bitrate_txt setStringValue: [NSString stringWithFormat:
-        @"%6.0f kb/s", (float)(p_item->p_stats->f_send_bitrate*8)*1000]];
-
-    /* Audio */
-    [o_audio_decoded_txt setIntValue: p_item->p_stats->i_decoded_audio];
-    [o_played_abuffers_txt setIntValue: p_item->p_stats->i_played_abuffers];
-    [o_lost_abuffers_txt setIntValue: p_item->p_stats->i_lost_abuffers];
-
-    vlc_mutex_unlock( &p_item->p_stats->lock );
+    if ([o_info_window isVisible]) {
+        if (!p_item || !p_item->p_stats) {
+            [self initMediaPanelStats];
+            return;
+        }
+
+        vlc_mutex_lock(&p_item->p_stats->lock);
+
+        /* input */
+        [o_read_bytes_txt setStringValue: [NSString stringWithFormat:
+            @"%8.0f KiB", (float)(p_item->p_stats->i_read_bytes)/1024]];
+        [o_input_bitrate_txt setStringValue: [NSString stringWithFormat:
+            @"%6.0f kb/s", (float)(p_item->p_stats->f_input_bitrate)*8000]];
+        [o_demux_bytes_txt setStringValue: [NSString stringWithFormat:
+            @"%8.0f KiB", (float)(p_item->p_stats->i_demux_read_bytes)/1024]];
+        [o_demux_bitrate_txt setStringValue: [NSString stringWithFormat:
+            @"%6.0f kb/s", (float)(p_item->p_stats->f_demux_bitrate)*8000]];
+
+        /* Video */
+        [o_video_decoded_txt setIntValue: p_item->p_stats->i_decoded_video];
+        [o_displayed_txt setIntValue: p_item->p_stats->i_displayed_pictures];
+        [o_lost_frames_txt setIntValue: p_item->p_stats->i_lost_pictures];
+
+        /* Sout */
+        [o_sent_packets_txt setIntValue: p_item->p_stats->i_sent_packets];
+        [o_sent_bytes_txt setStringValue: [NSString stringWithFormat: @"%8.0f KiB",
+            (float)(p_item->p_stats->i_sent_bytes)/1024]];
+        [o_sent_bitrate_txt setStringValue: [NSString stringWithFormat:
+            @"%6.0f kb/s", (float)(p_item->p_stats->f_send_bitrate*8)*1000]];
+
+        /* Audio */
+        [o_audio_decoded_txt setIntValue: p_item->p_stats->i_decoded_audio];
+        [o_played_abuffers_txt setIntValue: p_item->p_stats->i_played_abuffers];
+        [o_lost_abuffers_txt setIntValue: p_item->p_stats->i_lost_abuffers];
+
+        vlc_mutex_unlock(&p_item->p_stats->lock);
+    }
 }
 
 - (IBAction)metaFieldChanged:(id)sender
@@ -366,29 +329,9 @@ static VLCInfo *_o_sharedInstance = nil;
 
 - (IBAction)saveMetaData:(id)sender
 {
-    playlist_t * p_playlist = pl_Hold( VLCIntf );
-
-    if( !p_item ) goto error;
-
-    meta_export_t p_export;
-    p_export.p_item = p_item;
-
-    /* we can write meta data only in a file */
-    vlc_mutex_lock( &p_item->lock );
-    int i_type = p_item->i_type;
-    vlc_mutex_unlock( &p_item->lock );
-
-    if( i_type != ITEM_TYPE_FILE )
+    if (!p_item)
         goto error;
 
-    char *psz_uri_orig = input_item_GetURI( p_item );
-    char *psz_uri = psz_uri_orig;
-    if( !strncmp( psz_uri, "file://", 7 ) )
-        psz_uri += 7; /* strlen("file://") = 7 */
-
-    p_export.psz_file = strndup( psz_uri, PATH_MAX );
-    free( psz_uri_orig );
-
     #define utf8( o_blub ) \
         [[o_blub stringValue] UTF8String]
 
@@ -404,38 +347,30 @@ static VLCInfo *_o_sharedInstance = nil;
     input_item_SetDescription( p_item, utf8( o_description_txt ) );
     input_item_SetLanguage( p_item, utf8( o_language_txt ) );
 
-    PL_LOCK;
-    p_playlist->p_private = &p_export;
-
-    module_t *p_mod = module_need( p_playlist, "meta writer", NULL, false );
-    if( p_mod )
-        module_unneed( p_playlist, p_mod );
-    PL_UNLOCK;
+    playlist_t * p_playlist = pl_Get(VLCIntf);
+    input_item_WriteMeta(VLC_OBJECT(p_playlist), p_item);
 
-    var_SetBool( p_playlist, "intf-change", true );
+    var_SetBool(p_playlist, "intf-change", true);
     [self updatePanelWithItem: p_item];
 
-    pl_Release( VLCIntf );
     [o_saveMetaData_btn setEnabled: NO];
     return;
 
 error:
-    pl_Release( VLCIntf );
     NSRunAlertPanel(_NS("Error while saving meta"),
-        _NS("VLC was unable to save the meta data."),
+        @"%@",_NS("VLC was unable to save the meta data."),
         _NS("OK"), nil, nil);
 }
 
 - (IBAction)downloadCoverArt:(id)sender
 {
-    playlist_t * p_playlist = pl_Hold( VLCIntf );
-    if( p_item) playlist_AskForArtEnqueue( p_playlist, p_item, pl_Unlocked );
-    pl_Release( VLCIntf );
+    playlist_t * p_playlist = pl_Get(VLCIntf);
+    if (p_item) libvlc_ArtRequest(VLCIntf->p_libvlc, p_item);
 }
 
 - (input_item_t *)item
 {
-    if( p_item ) vlc_gc_incref( p_item );
+    if (p_item) vlc_gc_incref(p_item);
     return p_item;
 }
 
@@ -447,8 +382,7 @@ error:
 {
     BOOL bEnabled = TRUE;
 
-    if( [[o_mi title] isEqualToString: _NS("Information")] )
-    {
+    if ([[o_mi title] isEqualToString: _NS("Information")]) {
         return ![[[VLCMain sharedInstance] playlist] isSelectionEmpty];
     }
 
@@ -476,19 +410,17 @@ error:
 - (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
 {
     if ([[tableColumn identifier] isEqualToString:@"0"])
-    {
         return (item == nil) ? @"" : (id)[item name];
-    }
     else
-    {
         return (item == nil) ? @"" : (id)[item value];
-    }
 }
 
 @end
 
 @implementation VLCInfoTreeItem
 
+@synthesize name = o_name, value = o_value;
+
 #define IsALeafNode ((id)-1)
 
 - (id)initWithName: (NSString *)o_item_name value: (NSString *)o_item_value ID: (int)i_id
@@ -496,16 +428,15 @@ error:
 {
     self = [super init];
 
-    if( self != nil )
-    {
+    if (self != nil) {
         o_name = [o_item_name copy];
         o_value = [o_item_value copy];
         i_object_id = i_id;
         o_parent = o_parent_item;
-        p_item = [[[VLCMain sharedInstance] info] item];
+        p_item = [(VLCInfo *)[[VLCMain sharedInstance] info] item];
         o_children = nil;
     }
-    return( self );
+    return self;
 }
 
 - (id)init
@@ -515,10 +446,10 @@ error:
 
 - (void)dealloc
 {
-    if( o_children != IsALeafNode ) [o_children release];
+    if (o_children != IsALeafNode) [o_children release];
     [o_name release];
     [o_value release];
-    if( p_item ) vlc_gc_decref( p_item );
+    if (p_item) vlc_gc_decref(p_item);
     [super dealloc];
 }
 
@@ -526,76 +457,59 @@ error:
  * Loads children incrementally */
 - (NSArray *)children
 {
-    if( !p_item ) return nil;
+    if (!p_item)
+        return nil;
 
-    if (o_children == NULL)
-    {
-        int i;
-
-        if( i_object_id == -1 )
-        {
-            vlc_mutex_lock( &p_item->lock );
+    if (o_children == NULL) {
+        if (i_object_id == -1) {
+            vlc_mutex_lock(&p_item->lock);
             o_children = [[NSMutableArray alloc] initWithCapacity: p_item->i_categories];
-            for (i = 0 ; i < p_item->i_categories ; i++)
-            {
-                NSString * name = [NSString stringWithUTF8String: p_item->pp_categories[i]->psz_name];
+            for (int i = 0 ; i < p_item->i_categories ; i++) {
+                NSString * name = [NSString stringWithUTF8String:p_item->pp_categories[i]->psz_name];
                 VLCInfoTreeItem * item = [[VLCInfoTreeItem alloc] initWithName:name value:@"" ID:i parent:self];
                 [item autorelease];
                 [o_children addObject:item];
             }
-            vlc_mutex_unlock( &p_item->lock );
+            vlc_mutex_unlock(&p_item->lock);
         }
-        else if( o_parent->i_object_id == -1 )
-        {
-            vlc_mutex_lock( &p_item->lock );
+        else if (o_parent->i_object_id == -1) {
+            vlc_mutex_lock(&p_item->lock);
             info_category_t * cat = p_item->pp_categories[i_object_id];
             o_children = [[NSMutableArray alloc] initWithCapacity: cat->i_infos];
-            for (i = 0 ; i < cat->i_infos ; i++)
-            {
-                NSString * name = [NSString stringWithUTF8String: cat->pp_infos[i]->psz_name];
-                NSString * value = [NSString stringWithUTF8String: cat->pp_infos[i]->psz_value ? : ""];
+            for (int i = 0 ; i < cat->i_infos ; i++) {
+                NSString * name = [NSString stringWithUTF8String:cat->pp_infos[i]->psz_name];
+                NSString * value = [NSString stringWithUTF8String:cat->pp_infos[i]->psz_value ? : ""];
                 VLCInfoTreeItem * item = [[VLCInfoTreeItem alloc] initWithName:name value:value ID:i parent:self];
                 [item autorelease];
                 [o_children addObject:item];
             }
-            vlc_mutex_unlock( &p_item->lock );
+            vlc_mutex_unlock(&p_item->lock);
         }
         else
-        {
             o_children = IsALeafNode;
-        }
     }
     return o_children;
 }
 
-- (NSString *)name
-{
-    return [[o_name retain] autorelease];
-}
-
-- (NSString *)value
-{
-    return [[o_value retain] autorelease];
-}
-
 - (void)refresh
 {
     input_item_t * oldItem = p_item;
-    p_item = [[[VLCMain sharedInstance] info] item];
-    if( oldItem && oldItem != p_item ) vlc_gc_decref( oldItem );
+    p_item = [(VLCInfo *)[[VLCMain sharedInstance] info] item];
+    if (oldItem && oldItem != p_item)
+        vlc_gc_decref(oldItem);
 
     [o_children release];
     o_children = nil;
 }
 
-- (VLCInfoTreeItem *)childAtIndex:(int)i_index {
+- (VLCInfoTreeItem *)childAtIndex:(NSUInteger)i_index {
     return [[self children] objectAtIndex:i_index];
 }
 
 - (int)numberOfChildren {
 
     id i_tmp = [self children];
-    return ( i_tmp == IsALeafNode ) ? (-1) : (int)[i_tmp count];
+    return (i_tmp == IsALeafNode) ? (-1) : (int)[i_tmp count];
 }
 
 @end