if( self != nil )
{
p_item = NULL;
+ o_statUpdateTimer = nil;
}
return( self );
}
- (void)dealloc
{
- /* make that it is released in any case */
+ /* make sure that it is released in any case */
if ( o_statUpdateTimer )
[o_statUpdateTimer release];
[super dealloc];
[o_statUpdateTimer fire];
[o_statUpdateTimer retain];
}
+ else
+ {
+ if( [o_tab_view numberOfTabViewItems] > 2 )
+ [o_tab_view removeTabViewItem: [o_tab_view tabViewItemAtIndex: 2]];
+ }
[self initPanel:sender];
}
- (void)initPanel:(id)sender
{
+ [self updatePanel];
+ [o_info_window makeKeyAndOrderFront: sender];
+}
+
+- (void)updatePanel
+{
+ /* make sure that we got the current item and not an outdated one */
+ intf_thread_t * p_intf = VLCIntf;
+ playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+
+ if( p_playlist )
+ {
+ p_item = p_playlist->status.p_item;
+ vlc_object_release( p_playlist );
+ }
+
/* check whether our item is valid, because we would crash if not */
- if(! [self isItemInPlaylist: p_item] )
- return;
+ if(! [self isItemInPlaylist: p_item] ) return;
char *psz_temp;
- vlc_mutex_lock( &p_item->input.lock );
+ vlc_mutex_lock( &p_item->p_input->lock );
/* fill uri / title / author info */
- if( p_item->input.psz_uri )
+ if( p_item->p_input->psz_uri )
{
[o_uri_txt setStringValue:
- ([NSString stringWithUTF8String:p_item->input.psz_uri] == nil ) ?
- [NSString stringWithCString:p_item->input.psz_uri] :
- [NSString stringWithUTF8String:p_item->input.psz_uri]];
+ ([NSString stringWithUTF8String:p_item->p_input->psz_uri] == nil ) ?
+ [NSString stringWithCString:p_item->p_input->psz_uri] :
+ [NSString stringWithUTF8String:p_item->p_input->psz_uri]];
}
- if( p_item->input.psz_name )
+ if( p_item->p_input->psz_name )
{
[o_title_txt setStringValue:
- ([NSString stringWithUTF8String:p_item->input.psz_name] == nil ) ?
- [NSString stringWithCString:p_item->input.psz_name] :
- [NSString stringWithUTF8String:p_item->input.psz_name]];
+ ([NSString stringWithUTF8String:p_item->p_input->psz_name] == nil ) ?
+ [NSString stringWithCString:p_item->p_input->psz_name] :
+ [NSString stringWithUTF8String:p_item->p_input->psz_name]];
}
- vlc_mutex_unlock( &p_item->input.lock );
+ vlc_mutex_unlock( &p_item->p_input->lock );
- psz_temp = vlc_input_item_GetInfo( &p_item->input, _("Meta-information"), _("Artist") );
+ psz_temp = vlc_input_item_GetInfo( p_item->p_input, _("Meta-information"), _("Artist") );
if( psz_temp )
{
[[VLCInfoTreeItem rootItem] refresh];
[o_outline_view reloadData];
- BOOL b_stats = config_GetInt(VLCIntf, "stats");
- if(! b_stats )
- {
- if( [o_tab_view numberOfTabViewItems] > 2 )
- [o_tab_view removeTabViewItem: [o_tab_view tabViewItemAtIndex: 2]];
- }
- else
- {
- [self updateStatistics: nil];
- }
-
- [o_info_window makeKeyAndOrderFront: sender];
+ /* update the stats once to display p_item change faster */
+ [self updateStatistics: nil];
}
- (void)setMeta: (char *)meta forLabel: (id)theItem
{
- char *psz_meta = vlc_input_item_GetInfo( &p_item->input, \
+ char *psz_meta = vlc_input_item_GetInfo( p_item->p_input, \
_(VLC_META_INFO_CAT), _(meta) );
if( psz_meta != NULL && *psz_meta)
[theItem setStringValue: [NSString stringWithUTF8String: psz_meta]];
if( [self isItemInPlaylist: p_item] )
{
/* we can only do that if there's a valid input around */
-
- vlc_mutex_lock( &p_item->input.p_stats->lock );
+
+ vlc_mutex_lock( &p_item->p_input->p_stats->lock );
/* input */
[o_read_bytes_txt setStringValue: [NSString stringWithFormat: \
- @"%8.0f kB", (float)(p_item->input.p_stats->i_read_bytes)/1000]];
+ @"%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->input.p_stats->f_input_bitrate)*8000]];
+ @"%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->input.p_stats->i_demux_read_bytes)/1000]];
+ @"%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->input.p_stats->f_demux_bitrate)*8000]];
+ @"%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->input.p_stats->i_decoded_video]];
+ p_item->p_input->p_stats->i_decoded_video]];
[o_displayed_txt setStringValue: [NSString stringWithFormat: @"%5i", \
- p_item->input.p_stats->i_displayed_pictures]];
+ p_item->p_input->p_stats->i_displayed_pictures]];
[o_lost_frames_txt setStringValue: [NSString stringWithFormat: @"%5i", \
- p_item->input.p_stats->i_lost_pictures]];
+ p_item->p_input->p_stats->i_lost_pictures]];
/* Sout */
[o_sent_packets_txt setStringValue: [NSString stringWithFormat: @"%5i", \
- p_item->input.p_stats->i_sent_packets]];
+ p_item->p_input->p_stats->i_sent_packets]];
[o_sent_bytes_txt setStringValue: [NSString stringWithFormat: @"%8.0f kB", \
- (float)(p_item->input.p_stats->i_sent_bytes)/1000]];
+ (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->input.p_stats->f_send_bitrate*8)*1000]];
+ @"%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->input.p_stats->i_decoded_audio]];
+ p_item->p_input->p_stats->i_decoded_audio]];
[o_played_abuffers_txt setStringValue: [NSString stringWithFormat: @"%5i", \
- p_item->input.p_stats->i_played_abuffers]];
+ p_item->p_input->p_stats->i_played_abuffers]];
[o_lost_abuffers_txt setStringValue: [NSString stringWithFormat: @"%5i", \
- p_item->input.p_stats->i_lost_abuffers]];
+ p_item->p_input->p_stats->i_lost_abuffers]];
- vlc_mutex_unlock( &p_item->input.p_stats->lock );
+ vlc_mutex_unlock( &p_item->p_input->p_stats->lock );
}
}
if( [self isItemInPlaylist: p_item] )
{
- vlc_mutex_lock( &p_item->input.lock );
+ vlc_mutex_lock( &p_item->p_input->lock );
- p_item->input.psz_uri = strdup( [[o_uri_txt stringValue] UTF8String] );
- p_item->input.psz_name = strdup( [[o_title_txt stringValue] UTF8String] );
- vlc_mutex_unlock( &p_item->input.lock );
- vlc_input_item_AddInfo( &p_item->input, _("Meta-information"), _("Artist"), [[o_author_txt stringValue] UTF8String]);
+ p_item->p_input->psz_uri = strdup( [[o_uri_txt stringValue] UTF8String] );
+ p_item->p_input->psz_name = strdup( [[o_title_txt stringValue] UTF8String] );
+ vlc_mutex_unlock( &p_item->p_input->lock );
+ vlc_input_item_AddInfo( p_item->p_input, _("Meta-information"), _("Artist"), [[o_author_txt stringValue] UTF8String]);
val.b_bool = VLC_TRUE;
var_Set( p_playlist, "intf-change", val );
return NO;
}
- for( i = 0 ; i < p_playlist->i_size ; i++ )
+ for( i = 0 ; i < p_playlist->i_all_size ; i++ )
{
- if( p_playlist->pp_items[i] == p_local_item )
+ if( p_playlist->pp_all_items[i] == p_local_item )
{
vlc_object_release( p_playlist );
return YES;
input_thread_t * p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
FIND_ANYWHERE );
- if( [[o_mi title] isEqualToString: _NS("Info")] )
+ if( [[o_mi title] isEqualToString: _NS("Information")] )
{
if( p_input == NULL )
{
- (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
{
if( self == o_root_item )
{
- vlc_mutex_lock( &p_item->input.lock );
+ vlc_mutex_lock( &p_item->p_input->lock );
o_children = [[NSMutableArray alloc] initWithCapacity:
- p_item->input.i_categories];
- for (i = 0 ; i < p_item->input.i_categories ; i++)
+ p_item->p_input->i_categories];
+ for (i = 0 ; i < p_item->p_input->i_categories ; i++)
{
[o_children addObject:[[VLCInfoTreeItem alloc]
initWithName: [NSString stringWithUTF8String:
- p_item->input.pp_categories[i]->psz_name]
+ p_item->p_input->pp_categories[i]->psz_name]
value: @""
ID: i
parent: self]];
}
- vlc_mutex_unlock( &p_item->input.lock );
+ vlc_mutex_unlock( &p_item->p_input->lock );
}
else if( o_parent == o_root_item )
{
- vlc_mutex_lock( &p_item->input.lock );
+ vlc_mutex_lock( &p_item->p_input->lock );
o_children = [[NSMutableArray alloc] initWithCapacity:
- p_item->input.pp_categories[i_object_id]->i_infos];
+ p_item->p_input->pp_categories[i_object_id]->i_infos];
- for (i = 0 ; i < p_item->input.pp_categories[i_object_id]->i_infos ; i++)
+ for (i = 0 ; i < p_item->p_input->pp_categories[i_object_id]->i_infos ; i++)
{
[o_children addObject:[[VLCInfoTreeItem alloc]
initWithName: [NSString stringWithUTF8String:
- p_item->input.pp_categories[i_object_id]->pp_infos[i]->psz_name]
+ p_item->p_input->pp_categories[i_object_id]->pp_infos[i]->psz_name]
value: [NSString stringWithUTF8String:
- p_item->input.pp_categories[i_object_id]->pp_infos[i]->psz_value]
+ p_item->p_input->pp_categories[i_object_id]->pp_infos[i]->psz_value]
ID: i
parent: self]];
}
- vlc_mutex_unlock( &p_item->input.lock );
+ vlc_mutex_unlock( &p_item->p_input->lock );
}
else
{
projects / vlc / blobdiff