/*****************************************************************************
r playlistinfo.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2008 the VideoLAN team
+ * Copyright (C) 2002-2009 the VideoLAN team
* $Id$
*
* Authors: Benjamin Pracht <bigben at videolan dot org>
#include "intf.h"
#include "playlistinfo.h"
#include "playlist.h"
+#include <vlc_url.h>
/*****************************************************************************
* VLCPlaylistInfo Implementation
- (id)init
{
- if( _o_sharedInstance ) {
+ if( _o_sharedInstance )
+ {
[self dealloc];
- } else {
+ }
+ else
+ {
_o_sharedInstance = [super init];
if( _o_sharedInstance != nil )
- (void)awakeFromNib
{
- [o_info_window setExcludedFromWindowsMenu: TRUE];
+ [o_info_window setExcludedFromWindowsMenu: YES];
+ [o_info_window setFloatingPanel: NO];
[o_info_window setTitle: _NS("Media Information")];
[o_uri_lbl setStringValue: _NS("Location")];
[o_info_window setInitialFirstResponder: o_uri_txt];
[o_info_window setDelegate: self];
- /* We may be awoken from nib way after initialiwation
+ /* We may be awoken from nib way after initialisation
* Update ourselves */
[self updatePanelWithItem:p_item];
}
-- (void)stop
+- (void)stopTimers
{
/* make sure that the timer is released in any case */
if( o_statUpdateTimer && [o_statUpdateTimer isValid] )
- (void)initMediaPanelStats
{
//Initializing Input Variables
- [o_read_bytes_txt setStringValue: [NSString stringWithFormat:@"%8.0f kB", (float)0]];
+ [o_read_bytes_txt setStringValue: [NSString stringWithFormat:@"%8.0f 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:@"%8.0f KiB", (float)0]];
[o_demux_bitrate_txt setStringValue: [NSString stringWithFormat:@"%6.0f kb/s", (float)0]];
//Initializing Video Variables
//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:@"%8.0f KiB", (float)0]];
[o_sent_bitrate_txt setStringValue: [NSString stringWithFormat:@"%6.0f kb/s", (float)0]];
//Initializing Audio Variables
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 );
p_item = _p_item;
}
}
else
{
- /* fill uri info */
- char * psz_url = input_item_GetURI( p_item );
- [o_uri_txt setStringValue: [NSString stringWithUTF8String: psz_url ? psz_url : "" ]];
-
if( !input_item_IsPreparsed( p_item ) )
{
- playlist_t * p_playlist = pl_Yield( VLCIntf );
- playlist_PreparseEnqueue( p_playlist, p_item );
- pl_Release( VLCIntf );
+ playlist_PreparseEnqueue( pl_Get( VLCIntf ), 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 );
+ /* 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 );
+
#define SET( foo, bar ) \
char *psz_##foo = input_item_Get##bar ( p_item ); \
[self setMeta: psz_##foo forLabel: o_##foo##_txt]; \
FREENULL( psz_##foo );
/* fill the other fields */
- SET( title, Title );
SET( author, Artist );
SET( collection, Album );
SET( seqNum, TrackNum );
char *psz_meta;
NSImage *o_image;
psz_meta = input_item_GetArtURL( p_item );
- if( psz_meta && !strncmp( psz_meta, "file://", 7 ) )
- o_image = [[NSImage alloc] initWithContentsOfURL: [NSURL URLWithString: [NSString stringWithUTF8String: psz_meta]]];
+
+ /* 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];
/* update the stats once to display p_item change faster */
[self updateStatistics: nil];
-
}
- (void)setMeta: (char *)psz_meta forLabel: (id)theItem
/* input */
[o_read_bytes_txt setStringValue: [NSString stringWithFormat:
- @"%8.0f kB", (float)(p_item->p_stats->i_read_bytes)/1000]];
+ @"%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 kB", (float)(p_item->p_stats->i_demux_read_bytes)/1000]];
+ @"%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]];
/* 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_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]];
- (IBAction)saveMetaData:(id)sender
{
- playlist_t * p_playlist = pl_Yield( VLCIntf );
- vlc_value_t val;
-
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 )
- 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]
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, 0 );
- 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 );
- val.b_bool = true;
- var_Set( p_playlist, "intf-change", val );
+ 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("Impossible 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_Get( VLCIntf );
+ if( p_item) playlist_AskForArtEnqueue( p_playlist, p_item );
+}
+
- (input_item_t *)item
{
- vlc_gc_incref( p_item );
+ if( p_item ) vlc_gc_incref( p_item );
return p_item;
}
if( [[o_mi title] isEqualToString: _NS("Information")] )
{
- return ![[[VLCMain sharedInstance] getPlaylist] isSelectionEmpty];
+ return ![[[VLCMain sharedInstance] playlist] isSelectionEmpty];
}
return TRUE;
@implementation VLCInfo (NSTableDataSource)
-- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
+- (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
{
return (item == nil) ? [rootItem numberOfChildren] : [item numberOfChildren];
}
return ([item numberOfChildren] > 0);
}
-- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item
+- (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item
{
return (item == nil) ? [rootItem childAtIndex:index] : (id)[item childAtIndex:index];
}
}
}
-
@end
@implementation VLCInfoTreeItem
o_value = [o_item_value copy];
i_object_id = i_id;
o_parent = o_parent_item;
- p_item = [[[VLCMain sharedInstance] getInfo] item];
+ p_item = [[[VLCMain sharedInstance] info] item];
o_children = nil;
}
return( self );
- (void)refresh
{
- if( p_item ) vlc_gc_decref( p_item );
- p_item = [[[VLCMain sharedInstance] getInfo] item];
- if( o_children != NULL )
- {
- [o_children release];
- o_children = NULL;
- }
+ input_item_t * oldItem = p_item;
+ p_item = [[[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];
}
projects / vlc / blobdiff