/*****************************************************************************
r playlistinfo.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2004 VideoLAN
- * $Id: playlistinfo.m 7015 2004-03-08 15:22:58Z bigben $
+ * Copyright (C) 2002-2007 the VideoLAN team
+ * $Id$
*
- * Authors: Benjmaib Pracht <bigben at videolan dot org>
+ * Authors: Benjamin Pracht <bigben at videolan dot org>
+ * Felix Kühne <fkuehne at videolan dot org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* VLCPlaylistInfo Implementation
*****************************************************************************/
-@implementation VLCPlaylistInfo
+@implementation VLCInfo
+
+- (id)init
+{
+ self = [super init];
+
+ if( self != nil )
+ {
+ p_item = NULL;
+ o_statUpdateTimer = nil;
+ }
+ return( self );
+}
- (void)awakeFromNib
{
[o_info_window setExcludedFromWindowsMenu: TRUE];
- [o_info_window setTitle: _NS("Properties")];
+ [o_info_window setTitle: _NS("Information")];
[o_uri_lbl setStringValue: _NS("URI")];
[o_title_lbl setStringValue: _NS("Title")];
[o_author_lbl setStringValue: _NS("Author")];
- [o_btn_info_ok setTitle: _NS("OK")];
- [o_btn_info_cancel setTitle: _NS("Cancel")];
- [o_btn_delete_group setTitle: _NS("Delete Group")];
- [o_btn_add_group setTitle: _NS("Add Group")];
- [o_group_lbl setStringValue: _NS("Group")];
+ [o_btn_ok setTitle: _NS("OK")];
+ [o_btn_cancel setTitle: _NS("Cancel")];
+
+ [[o_tab_view tabViewItemAtIndex: 0] setLabel: _NS("General")];
+ [[o_tab_view tabViewItemAtIndex: 1] setLabel: _NS("Advanced Information")];
+ [[o_tab_view tabViewItemAtIndex: 2] setLabel: _NS("Statistics")];
+ [o_tab_view selectTabViewItemAtIndex: 0];
+
+ /* constants defined in vlc_meta.h */
+ [o_genre_lbl setStringValue: _NS(VLC_META_GENRE)];
+ [o_copyright_lbl setStringValue: _NS(VLC_META_COPYRIGHT)];
+ [o_collection_lbl setStringValue: _NS(VLC_META_COLLECTION)];
+ [o_seqNum_lbl setStringValue: _NS(VLC_META_SEQ_NUM)];
+ [o_description_lbl setStringValue: _NS(VLC_META_DESCRIPTION)];
+ [o_rating_lbl setStringValue: _NS(VLC_META_RATING)];
+ [o_date_lbl setStringValue: _NS(VLC_META_DATE)];
+ [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)];
+
+ /* statistics */
+ [o_input_box setTitle: _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_decoded_lbl setStringValue: _NS("Decoded blocks")];
+ [o_displayed_lbl setStringValue: _NS("Displayed frames")];
+ [o_lost_frames_lbl setStringValue: _NS("Lost frames")];
+
+ [o_sout_box setTitle: _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_decoded_lbl setStringValue: _NS("Decoded blocks")];
+ [o_played_abuffers_lbl setStringValue: _NS("Played buffers")];
+ [o_lost_abuffers_lbl setStringValue: _NS("Lost buffers")];
}
-- (IBAction)togglePlaylistInfoPanel:(id)sender
+- (void)dealloc
{
- intf_thread_t * p_intf = [NSApp getIntf];
- playlist_t * p_playlist;
+ /* make sure that the timer is released in any case */
+ if( [o_statUpdateTimer isValid] )
+ [o_statUpdateTimer invalidate];
+
+ if ( o_statUpdateTimer )
+ [o_statUpdateTimer release];
+
+ [super dealloc];
+}
+#if GC_ENABLED
+- (void)finalize
+{
+ /* since dealloc isn't called with enabled GC on 10.5, we need this to prevent core crashes */
+ if( [o_statUpdateTimer isValid] )
+ [o_statUpdateTimer invalidate];
+ [super finalize];
+}
+#endif
+
+- (IBAction)togglePlaylistInfoPanel:(id)sender
+{
if( [o_info_window isVisible] )
{
+ [self windowShouldClose: nil];
[o_info_window orderOut: sender];
}
else
{
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ p_item = [[[VLCMain sharedInstance] getPlaylist] selectedPlaylistItem];
+ [self initPanel:sender];
+ }
+}
- if (p_playlist)
- {
- /*fill uri / title / author info */
- int i_item = [o_vlc_playlist selectedPlaylistItem];
- [o_uri_txt setStringValue:
- ([NSString stringWithUTF8String:p_playlist->
- pp_items[i_item]->input.psz_uri] == nil ) ?
- [NSString stringWithCString:p_playlist->
- pp_items[i_item]->input.psz_uri] :
- [NSString stringWithUTF8String:p_playlist->
- pp_items[i_item]->input.psz_uri]];
-
- [o_title_txt setStringValue:
- ([NSString stringWithUTF8String:p_playlist->
- pp_items[i_item]->input.psz_name] == nil ) ?
- [NSString stringWithCString:p_playlist->
- pp_items[i_item]->input.psz_name] :
- [NSString stringWithUTF8String:p_playlist->
- pp_items[i_item]->input.psz_name]];
-
- [o_author_txt setStringValue:
- [NSString stringWithUTF8String:playlist_GetInfo
- (p_playlist, i_item ,_("General"),_("Author") )]];
-
- [[VLCInfoTreeItem rootItem] refresh];
- [o_outline_view reloadData];
-
- [self createComboBox];
- [self handleGroup:self];
+- (IBAction)toggleInfoPanel:(id)sender
+{
+ if( [o_info_window isVisible] )
+ {
+ [self windowShouldClose: nil];
+ [o_info_window orderOut: sender];
+ }
+ else
+ {
+ intf_thread_t * p_intf = VLCIntf;
+ playlist_t * p_playlist = pl_Yield( p_intf );
- vlc_object_release( p_playlist );
- }
- [o_info_window makeKeyAndOrderFront: sender];
+ p_item = p_playlist->status.p_item;
+ vlc_object_release( p_playlist );
+
+ [self initPanel:sender];
}
}
-- (IBAction)infoCancel:(id)sender
+- (void)initPanel:(id)sender
{
- [self togglePlaylistInfoPanel:self];
-}
+ BOOL b_stats = config_GetInt(VLCIntf, "stats");
+ if( b_stats )
+ {
+ o_statUpdateTimer = [NSTimer scheduledTimerWithTimeInterval: 1
+ target: self selector: @selector(updateStatistics:)
+ userInfo: nil repeats: YES];
+ [o_statUpdateTimer fire];
+ [o_statUpdateTimer retain];
+ }
+ else
+ {
+ if( [o_tab_view numberOfTabViewItems] > 2 )
+ [o_tab_view removeTabViewItem: [o_tab_view tabViewItemAtIndex: 2]];
+ }
+ [self updatePanel];
+ [o_info_window makeKeyAndOrderFront: sender];
+}
-- (IBAction)infoOk:(id)sender
+- (void)updatePanel
{
- int i,i_row,c;
- int i_item = [o_vlc_playlist selectedPlaylistItem];
- intf_thread_t * p_intf = [NSApp getIntf];
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- vlc_value_t val;
- NSMutableArray * o_selected = [o_vlc_playlist selectedPlaylistItemsList];
- NSNumber * o_number;
+ /* make sure that we got the current item and not an outdated one */
+ intf_thread_t * p_intf = VLCIntf;
+ playlist_t * p_playlist = pl_Yield( p_intf );
+ p_item = p_playlist->status.p_item;
+ vlc_object_release( p_playlist );
- if (p_playlist)
+ /* check whether our item is valid, because we would crash if not */
+ if(! [self isItemInPlaylist: p_item] ) return;
+
+ /* fill uri info */
+ char *psz_uri = input_item_GetURI( p_item->p_input );
+ if( psz_uri )
{
- vlc_mutex_lock(&p_playlist->pp_items[i_item]->input.lock);
+ [o_uri_txt setStringValue:
+ ([NSString stringWithUTF8String:psz_uri] == nil ) ?
+ [NSString stringWithCString:psz_uri] :
+ [NSString stringWithUTF8String:psz_uri]];
+ }
+ free( psz_uri );
+
+#define SET( foo, bar ) \
+ char *psz_##foo = input_item_Get##bar ( p_item->p_input ); \
+ [self setMeta: psz_##foo forlabel: o_##foo##_txt]; \
+ free( psz_##foo );
+
+ /* fill the other fields */
+ SET( title, Title );
+ SET( author, Artist );
+ SET( collection, Album );
+ SET( seqNum, TrackNum );
+ SET( genre, Genre );
+ SET( copyright, Copyright );
+ SET( rating, Rating );
+ SET( publisher, Publisher );
+ SET( nowPlaying, NowPlaying );
+ SET( language, Language );
+ SET( date, Date );
+
+#undef SET
+
+ /* reload the advanced table */
+ [[VLCInfoTreeItem rootItem] refresh];
+ [o_outline_view reloadData];
+
+ /* update the stats once to display p_item change faster */
+ [self updateStatistics: nil];
+}
- p_playlist->pp_items[i_item]->input.psz_uri =
- strdup([[o_uri_txt stringValue] cString]);
- p_playlist->pp_items[i_item]->input.psz_name =
- strdup([[o_title_txt stringValue] cString]);
- playlist_ItemAddInfo(p_playlist->pp_items[i_item],_("General"),_("Author"), [[o_author_txt stringValue] cString]);
+- (void)setMeta: (char *)psz_meta forLabel: (id)theItem
+{
+ if( psz_meta != NULL && *psz_meta)
+ [theItem setStringValue:
+ ([NSString stringWithUTF8String:psz_meta] == nil ) ?
+ [NSString stringWithCString:psz_meta] :
+ [NSString stringWithUTF8String:psz_meta]];
+ else
+ [theItem setStringValue: @"-"];
+}
- c = (int)[o_selected count];
+- (void)updateStatistics:(NSTimer*)theTimer
+{
+ if( [self isItemInPlaylist: p_item] )
+ {
+ /* we can only do that if there's a valid input around */
+
+ vlc_mutex_lock( &p_item->p_input->p_stats->lock );
+
+ /* input */
+ [o_read_bytes_txt setStringValue: [NSString stringWithFormat:
+ @"%8.0f kB", (float)(p_item->p_input->p_stats->i_read_bytes)/1000]];
+ [o_input_bitrate_txt setStringValue: [NSString stringWithFormat:
+ @"%6.0f kb/s", (float)(p_item->p_input->p_stats->f_input_bitrate)*8000]];
+ [o_demux_bytes_txt setStringValue: [NSString stringWithFormat:
+ @"%8.0f kB", (float)(p_item->p_input->p_stats->i_demux_read_bytes)/1000]];
+ [o_demux_bitrate_txt setStringValue: [NSString stringWithFormat:
+ @"%6.0f kb/s", (float)(p_item->p_input->p_stats->f_demux_bitrate)*8000]];
+
+ /* Video */
+ [o_video_decoded_txt setStringValue: [NSString stringWithFormat: @"%5i",
+ p_item->p_input->p_stats->i_decoded_video]];
+ [o_displayed_txt setStringValue: [NSString stringWithFormat: @"%5i",
+ p_item->p_input->p_stats->i_displayed_pictures]];
+ [o_lost_frames_txt setStringValue: [NSString stringWithFormat: @"%5i",
+ p_item->p_input->p_stats->i_lost_pictures]];
+
+ /* Sout */
+ [o_sent_packets_txt setStringValue: [NSString stringWithFormat: @"%5i",
+ p_item->p_input->p_stats->i_sent_packets]];
+ [o_sent_bytes_txt setStringValue: [NSString stringWithFormat: @"%8.0f kB",
+ (float)(p_item->p_input->p_stats->i_sent_bytes)/1000]];
+ [o_sent_bitrate_txt setStringValue: [NSString stringWithFormat:
+ @"%6.0f kb/s", (float)(p_item->p_input->p_stats->f_send_bitrate*8)*1000]];
+
+ /* Audio */
+ [o_audio_decoded_txt setStringValue: [NSString stringWithFormat: @"%5i",
+ p_item->p_input->p_stats->i_decoded_audio]];
+ [o_played_abuffers_txt setStringValue: [NSString stringWithFormat: @"%5i",
+ p_item->p_input->p_stats->i_played_abuffers]];
+ [o_lost_abuffers_txt setStringValue: [NSString stringWithFormat: @"%5i",
+ p_item->p_input->p_stats->i_lost_abuffers]];
+
+ vlc_mutex_unlock( &p_item->p_input->p_stats->lock );
+ }
+}
- if ([[o_group_cbx stringValue] isEqual:
- [o_group_cbx objectValueOfSelectedItem]])
- {
- for (i = 0 ; i < c ; i++)
- {
- o_number = [o_selected lastObject];
- i_row = [o_number intValue];
- p_playlist->pp_items[i_row]->i_group = p_playlist->
- pp_groups[[o_group_cbx indexOfSelectedItem]]->i_id;
- [o_selected removeObject: o_number];
- }
- }
- else
- {
- playlist_group_t * p_group = playlist_CreateGroup( p_playlist,
- strdup([[o_group_cbx stringValue] cString]));
- if (p_group)
- {
- for (i = 0 ; i < c ; i++)
- {
- o_number = [o_selected lastObject];
- i_row = [o_number intValue];
- p_playlist->pp_items[i_row]->i_group = p_group->i_id;
- [o_selected removeObject: o_number];
- }
- }
- }
+- (IBAction)infoCancel:(id)sender
+{
+ [self windowShouldClose: nil];
+ [o_info_window orderOut: self];
+}
- vlc_mutex_unlock(&p_playlist->pp_items[i_item]->input.lock);
+- (IBAction)infoOk:(id)sender
+{
+ intf_thread_t * p_intf = VLCIntf;
+ playlist_t * p_playlist = pl_Yield( p_intf );
+ vlc_value_t val;
+
+ if( [self isItemInPlaylist: p_item] )
+ {
+ input_item_SetName( p_item->p_input, (char*)
+ [[o_title_txt stringValue] UTF8String] );
+ input_item_SetURI( p_item->p_input, (char*)
+ [[o_uri_txt stringValue] UTF8String] );
+ input_item_SetArtist( p_item->p_input, (char*)
+ [[o_author_txt stringValue] UTF8String] );
+
val.b_bool = VLC_TRUE;
- var_Set( p_playlist,"intf-change",val );
- vlc_object_release ( p_playlist );
+ var_Set( p_playlist, "intf-change", val );
}
- [self togglePlaylistInfoPanel:self];
+ vlc_object_release( p_playlist );
+ [self windowShouldClose: nil];
+ [o_info_window orderOut: self];
}
-- (IBAction)handleGroup:(id)sender
+- (playlist_item_t *)getItem
{
- intf_thread_t * p_intf = [NSApp getIntf];
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
-
- if (p_playlist)
- {
- if ([[o_group_cbx stringValue] isEqual:
- [o_group_cbx objectValueOfSelectedItem]])
- {
- [o_group_color setBackgroundColor:[o_vlc_playlist
- getColor: p_playlist->pp_groups[
- [o_group_cbx indexOfSelectedItem]]->i_id]];
- }
- else
- {
- [o_group_color setBackgroundColor:[o_vlc_playlist
- getColor:p_playlist->pp_groups[
- [o_group_cbx numberOfItems] - 1]->i_id + 1]];
- }
- vlc_object_release(p_playlist);
- }
+ return p_item;
}
-- (IBAction)deleteOutlineGroup:(id)sender
+- (BOOL)isItemInPlaylist:(playlist_item_t *)p_local_item
{
- intf_thread_t * p_intf = [NSApp getIntf];
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ intf_thread_t * p_intf = VLCIntf;
+ playlist_t * p_playlist = pl_Yield( p_intf );
+ int i;
- if(p_playlist)
+ for( i = 0 ; i < p_playlist->all_items.i_size ; i++ )
{
- if ([[o_group_cbx stringValue] isEqual:
- [o_group_cbx objectValueOfSelectedItem]])
+ if( ARRAY_VAL( p_playlist->all_items, i ) == p_local_item )
{
- [o_vlc_playlist deleteGroup:p_playlist->pp_groups[
- [o_group_cbx indexOfSelectedItem]]->i_id];
- [self createComboBox];
- [self handleGroup:self];
- [o_group_cbx reloadData];
+ vlc_object_release( p_playlist );
+ return YES;
}
- else
- {
- msg_Warn(p_playlist,"Group doesn't exist, cannot delete");
- }
- vlc_object_release(p_playlist);
}
+ vlc_object_release( p_playlist );
+ return NO;
}
-- (IBAction)createOutlineGroup:(id)sender;
+- (BOOL)windowShouldClose:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if(p_playlist)
- {
- playlist_CreateGroup( p_playlist,
- strdup([[o_group_cbx stringValue] cString]));
- [self createComboBox];
- [o_group_cbx reloadData];
- [o_vlc_playlist playlistUpdated];
- vlc_object_release(p_playlist);
- }
+ if( [o_statUpdateTimer isValid] )
+ [o_statUpdateTimer invalidate];
+
+ if( o_statUpdateTimer )
+ [o_statUpdateTimer release];
+
+ return YES;
}
--(void)createComboBox
+@end
+
+@implementation VLCInfo (NSMenuValidation)
+
+- (BOOL)validateMenuItem:(NSMenuItem *)o_mi
{
- intf_thread_t * p_intf = [NSApp getIntf];
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- int i;
- int i_item = [o_vlc_playlist selectedPlaylistItem];
+ BOOL bEnabled = TRUE;
- [o_group_cbx removeAllItems];
+ intf_thread_t * p_intf = VLCIntf;
+ input_thread_t * p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
+ FIND_ANYWHERE );
- if (p_playlist)
+ if( [[o_mi title] isEqualToString: _NS("Information")] )
{
- for (i = 0; i < p_playlist->i_groups ; i++)
+ if( p_input == NULL )
{
- [o_group_cbx addItemWithObjectValue:
- [NSString stringWithUTF8String:
- p_playlist->pp_groups[i]->psz_name]];
- if (p_playlist->pp_items[i_item]->i_group == p_playlist
- ->pp_groups[i]->i_id)
- {
- [o_group_cbx selectItemAtIndex:i];
- }
+ bEnabled = FALSE;
}
- vlc_object_release(p_playlist);
}
-}
+ if( p_input ) vlc_object_release( p_input );
-@end
+ return( bEnabled );
+}
+@end
-@implementation VLCPlaylistInfo (NSTableDataSource)
+@implementation VLCInfo (NSTableDataSource)
-- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
+- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
{
return (item == nil) ? [[VLCInfoTreeItem rootItem] numberOfChildren] : [item numberOfChildren];
}
return ([item numberOfChildren] > 0);
}
-- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item
+- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item
{
- return (item == nil) ? [[VLCInfoTreeItem rootItem] childAtIndex:index] : [item childAtIndex:index];
+ return (item == nil) ? [[VLCInfoTreeItem rootItem] childAtIndex:index] : (id)[item childAtIndex:index];
}
- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
}
}
+
@end
@implementation VLCInfoTreeItem
- (id)initWithName: (NSString *)o_item_name value: (NSString *)o_item_value ID: (int)i_id parent:(VLCInfoTreeItem *)o_parent_item
{
self = [super init];
-
+
if( self != nil )
{
-
- i_item = [[[NSApp delegate] getPlaylist] selectedPlaylistItem];
o_name = [o_item_name copy];
o_value = [o_item_value copy];
i_object_id = i_id;
o_parent = o_parent_item;
+ if( [[VLCMain sharedInstance] getInfo] != nil )
+ p_item = [[[VLCMain sharedInstance] getInfo] getItem];
+ else
+ p_item = NULL;
}
return( self );
}
+ (VLCInfoTreeItem *)rootItem {
- if (o_root_item == nil) o_root_item = [[VLCInfoTreeItem alloc] initWithName:@"main" value: @"" ID: 0 parent:nil];
+ if( o_root_item == nil )
+ o_root_item = [[VLCInfoTreeItem alloc] initWithName:@"main" value: @"" ID: 0 parent:nil];
return o_root_item;
}
- (void)dealloc
{
- if (o_children != IsALeafNode) [o_children release];
+ if( o_children != IsALeafNode ) [o_children release];
[o_name release];
[super dealloc];
}
{
if (o_children == NULL)
{
- intf_thread_t * p_intf = [NSApp getIntf];
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
int i;
- if (p_playlist)
+ if( [[[VLCMain sharedInstance] getInfo] isItemInPlaylist: p_item] )
{
- if (i_item > -1)
+ if( self == o_root_item )
{
- if (self == o_root_item)
- {
- o_children = [[NSMutableArray alloc] initWithCapacity:p_playlist->pp_items[i_item]->input.i_categories];
- for (i = 0 ; i<p_playlist->pp_items[i_item]->input.i_categories ; i++)
- {
- [o_children addObject:[[VLCInfoTreeItem alloc]
- initWithName: [NSString stringWithUTF8String:
- p_playlist->pp_items[i_item]->input.
- pp_categories[i]->psz_name]
- value: @""
- ID: i
- parent: self]];
- }
- }
- else if (o_parent == o_root_item)
+ vlc_mutex_lock( &p_item->p_input->lock );
+ o_children = [[NSMutableArray alloc] initWithCapacity:
+ p_item->p_input->i_categories];
+ for (i = 0 ; i < p_item->p_input->i_categories ; i++)
{
- o_children = [[NSMutableArray alloc] initWithCapacity:
- p_playlist->pp_items[i_item]->input.
- pp_categories[i_object_id]->i_infos];
- for (i = 0 ; i<p_playlist->pp_items[i_item]->input.
- pp_categories[i_object_id]->i_infos ; i++)
- {
- [o_children addObject:[[VLCInfoTreeItem alloc]
+ [o_children addObject:[[VLCInfoTreeItem alloc]
initWithName: [NSString stringWithUTF8String:
- p_playlist->pp_items[i_item]->input.
- pp_categories[i_object_id]->
- pp_infos[i]->psz_name]
- value: [NSString stringWithUTF8String:
- p_playlist->pp_items[i_item]->input.
- pp_categories[i_object_id]->
- pp_infos[i]->psz_value]
- ID: i
- parent: self]];
- }
+ p_item->p_input->pp_categories[i]->psz_name]
+ value: @""
+ ID: i
+ parent: self]];
}
- else
+ vlc_mutex_unlock( &p_item->p_input->lock );
+ }
+ else if( o_parent == o_root_item )
+ {
+ vlc_mutex_lock( &p_item->p_input->lock );
+ o_children = [[NSMutableArray alloc] initWithCapacity:
+ p_item->p_input->pp_categories[i_object_id]->i_infos];
+
+ for (i = 0 ; i < p_item->p_input->pp_categories[i_object_id]->i_infos ; i++)
{
- o_children = IsALeafNode;
+ [o_children addObject:[[VLCInfoTreeItem alloc]
+ initWithName: [NSString stringWithUTF8String:
+ p_item->p_input->pp_categories[i_object_id]->pp_infos[i]->psz_name]
+ value: [NSString stringWithUTF8String:
+ p_item->p_input->pp_categories[i_object_id]->pp_infos[i]->psz_value]
+ ID: i
+ parent: self]];
}
+ vlc_mutex_unlock( &p_item->p_input->lock );
+ }
+ else
+ {
+ o_children = IsALeafNode;
}
- vlc_object_release(p_playlist);
}
}
return o_children;
- (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];
}
-- (int)selectedPlaylistItem
+/*- (int)selectedPlaylistItem
{
- return i_item;
+ return i_item;
}
-
+*/
- (void)refresh
{
- if (o_children != NULL)
+ p_item = [[[VLCMain sharedInstance] getInfo] getItem];
+ if( o_children != NULL )
{
[o_children release];
o_children = NULL;
}
- i_item = [[[NSApp delegate] getPlaylist] selectedPlaylistItem];
}
@end
projects / vlc / blobdiff