/*****************************************************************************
r playlistinfo.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2006 the VideoLAN team
+ * Copyright (C) 2002-2007 the VideoLAN team
* $Id$
*
* Authors: Benjamin Pracht <bigben at videolan dot org>
- (void)dealloc
{
- /* make that it is released in any case */
+ /* 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] )
else
{
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 );
- }
-
- 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];
- }
+ playlist_t * p_playlist = pl_Yield( p_intf );
+ p_item = p_playlist->status.p_item;
+ vlc_object_release( p_playlist );
+
[self initPanel:sender];
}
}
- (void)initPanel:(id)sender
{
- /* check whether our item is valid, because we would crash if not */
- if(! [self isItemInPlaylist: p_item] )
- return;
- char *psz_temp;
- vlc_mutex_lock( &p_item->input.lock );
-
- /* fill uri / title / author info */
- if( p_item->input.psz_uri )
+ BOOL b_stats = config_GetInt(VLCIntf, "stats");
+ if( b_stats )
{
- [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]];
+ o_statUpdateTimer = [NSTimer scheduledTimerWithTimeInterval: 1
+ target: self selector: @selector(updateStatistics:)
+ userInfo: nil repeats: YES];
+ [o_statUpdateTimer fire];
+ [o_statUpdateTimer retain];
}
-
- if( p_item->input.psz_name )
+ else
{
- [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]];
+ if( [o_tab_view numberOfTabViewItems] > 2 )
+ [o_tab_view removeTabViewItem: [o_tab_view tabViewItemAtIndex: 2]];
}
- vlc_mutex_unlock( &p_item->input.lock );
- psz_temp = vlc_input_item_GetInfo( &p_item->input, _("Meta-information"), _("Artist") );
+ [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 = pl_Yield( p_intf );
- if( psz_temp )
+ 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;
+
+ vlc_mutex_lock( &p_item->p_input->lock );
+
+ /* fill uri info */
+ if( p_item->p_input->psz_uri )
{
- [o_author_txt setStringValue: [NSString stringWithUTF8String: psz_temp]];
- free( psz_temp );
+ [o_uri_txt setStringValue:
+ ([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]];
}
/* fill the other fields */
- [self setMeta: VLC_META_GENRE forLabel: o_genre_txt];
- [self setMeta: VLC_META_COPYRIGHT forLabel: o_copyright_txt];
- [self setMeta: VLC_META_COLLECTION forLabel: o_collection_txt];
- [self setMeta: VLC_META_SEQ_NUM forLabel: o_seqNum_txt];
- [self setMeta: VLC_META_DESCRIPTION forLabel: o_description_txt];
- [self setMeta: VLC_META_RATING forLabel: o_rating_txt];
- [self setMeta: VLC_META_DATE forLabel: o_date_txt];
- [self setMeta: VLC_META_LANGUAGE forLabel: o_language_txt];
- [self setMeta: VLC_META_NOW_PLAYING forLabel: o_nowPlaying_txt];
- [self setMeta: VLC_META_PUBLISHER forLabel: o_publisher_txt];
+#define p_m p_item->p_input->p_meta
+ [self setMeta: p_m->psz_title forLabel: o_title_txt];
+ [self setMeta: p_m->psz_artist forLabel: o_author_txt];
+ [self setMeta: p_m->psz_album forLabel: o_collection_txt];
+ [self setMeta: p_m->psz_tracknum forLabel: o_seqNum_txt];
+ [self setMeta: p_m->psz_genre forLabel: o_genre_txt];
+ [self setMeta: p_m->psz_copyright forLabel: o_copyright_txt];
+ [self setMeta: p_m->psz_rating forLabel: o_rating_txt];
+ [self setMeta: p_m->psz_publisher forLabel: o_publisher_txt];
+ [self setMeta: p_m->psz_nowplaying forLabel: o_nowPlaying_txt];
+ [self setMeta: p_m->psz_language forLabel: o_language_txt];
+ [self setMeta: p_m->psz_date forLabel: o_date_txt];
+#undef p_m
+ vlc_mutex_unlock( &p_item->p_input->lock );
/* reload the advanced table */
[[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
+- (void)setMeta: (char *)psz_meta forLabel: (id)theItem
{
- char *psz_meta = vlc_input_item_GetInfo( &p_item->input, \
- _(VLC_META_INFO_CAT), _(meta) );
if( psz_meta != NULL && *psz_meta)
- [theItem setStringValue: [NSString stringWithUTF8String: psz_meta]];
+ [theItem setStringValue:
+ ([NSString stringWithUTF8String:psz_meta] == nil ) ?
+ [NSString stringWithCString:psz_meta] :
+ [NSString stringWithUTF8String:psz_meta]];
else
[theItem setStringValue: @"-"];
}
{
/* 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]];
- [o_input_bitrate_txt setStringValue: [NSString stringWithFormat: \
- @"%6.0f kb/s", (float)(p_item->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]];
- [o_demux_bitrate_txt setStringValue: [NSString stringWithFormat: \
- @"%6.0f kb/s", (float)(p_item->input.p_stats->f_demux_bitrate)*8000]];
+ [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->input.p_stats->i_decoded_video]];
- [o_displayed_txt setStringValue: [NSString stringWithFormat: @"%5i", \
- p_item->input.p_stats->i_displayed_pictures]];
- [o_lost_frames_txt setStringValue: [NSString stringWithFormat: @"%5i", \
- p_item->input.p_stats->i_lost_pictures]];
+ [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->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]];
- [o_sent_bitrate_txt setStringValue: [NSString stringWithFormat: \
- @"%6.0f kb/s", (float)(p_item->input.p_stats->f_send_bitrate*8)*1000]];
+ [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->input.p_stats->i_decoded_audio]];
- [o_played_abuffers_txt setStringValue: [NSString stringWithFormat: @"%5i", \
- p_item->input.p_stats->i_played_abuffers]];
- [o_lost_abuffers_txt setStringValue: [NSString stringWithFormat: @"%5i", \
- p_item->input.p_stats->i_lost_abuffers]];
-
- vlc_mutex_unlock( &p_item->input.p_stats->lock );
+ [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 );
}
}
- (IBAction)infoOk:(id)sender
{
intf_thread_t * p_intf = VLCIntf;
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t * p_playlist = pl_Yield( p_intf );
vlc_value_t val;
if( [self isItemInPlaylist: p_item] )
{
- vlc_mutex_lock( &p_item->input.lock );
+ vlc_mutex_lock( &p_item->p_input->lock );
+
+ 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_meta_SetArtist( p_item->p_input->p_meta, [[o_author_txt stringValue] UTF8String] );
+ vlc_mutex_unlock( &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]);
-
val.b_bool = VLC_TRUE;
var_Set( p_playlist, "intf-change", val );
}
- (BOOL)isItemInPlaylist:(playlist_item_t *)p_local_item
{
intf_thread_t * p_intf = VLCIntf;
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t * p_playlist = pl_Yield( p_intf );
int i;
- if( p_playlist == NULL )
- {
- return NO;
- }
-
- for( i = 0 ; i < p_playlist->i_size ; i++ )
+ for( i = 0 ; i < p_playlist->all_items.i_size ; i++ )
{
- if( p_playlist->pp_all_items[i] == p_local_item )
+ if( ARRAY_VAL( p_playlist->all_items, i ) == p_local_item )
{
vlc_object_release( p_playlist );
return YES;
- (BOOL)windowShouldClose:(id)sender
{
- if( o_statUpdateTimer )
- {
+ if( [o_statUpdateTimer isValid] )
[o_statUpdateTimer invalidate];
+
+ if( o_statUpdateTimer )
[o_statUpdateTimer release];
- }
+
return YES;
}
- (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
}
+ (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;
}
{
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