/*****************************************************************************
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>
[o_author_lbl setStringValue: _NS("Author")];
[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_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")];
[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 );
- }
+ playlist_t * p_playlist = pl_Yield( p_intf );
+ p_item = p_playlist->status.p_item;
+ vlc_object_release( p_playlist );
+
[self initPanel:sender];
}
}
{
o_statUpdateTimer = [NSTimer scheduledTimerWithTimeInterval: 1
target: self selector: @selector(updateStatistics:)
- userInfo: nil repeats: YES];
+ userInfo: nil repeats: YES];
[o_statUpdateTimer fire];
[o_statUpdateTimer retain];
}
{
/* 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 );
+ playlist_t * p_playlist = pl_Yield( p_intf );
- if( p_playlist )
- {
- p_item = p_playlist->status.p_item;
- vlc_object_release( 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;
- vlc_mutex_lock( &p_item->p_input->lock );
-
/* fill uri info */
- if( p_item->p_input->psz_uri )
+ char *psz_uri = input_item_GetURI( p_item->p_input );
+ if( psz_uri )
{
[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]];
+ ([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 */
-#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 );
+ 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];
- (void)setMeta: (char *)psz_meta forLabel: (id)theItem
{
if( psz_meta != NULL && *psz_meta)
- [theItem setStringValue:
- ([NSString stringWithUTF8String:psz_meta] == nil ) ?
+ [theItem setStringValue:
+ ([NSString stringWithUTF8String:psz_meta] == nil ) ?
[NSString stringWithCString:psz_meta] :
[NSString stringWithUTF8String:psz_meta]];
else
- (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->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 );
+ 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 );
- (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_all_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;
}
+ (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;
}
projects / vlc / blobdiff