* Preamble
*****************************************************************************/
-#include "intf.h"
-#include "playlistinfo.h"
-#include "playlist.h"
-#include <vlc_url.h>
+#import "CompatibilityFixes.h"
+#import "intf.h"
+#import "playlistinfo.h"
+#import "playlist.h"
+#import <vlc_url.h>
/*****************************************************************************
* VLCPlaylistInfo Implementation
if( _o_sharedInstance != nil )
{
p_item = NULL;
- o_statUpdateTimer = nil;
[self updatePanelWithItem: NULL];
rootItem = [[VLCInfoTreeItem alloc] init];
}
{
[o_info_window setExcludedFromWindowsMenu: YES];
[o_info_window setFloatingPanel: NO];
+ if (OSX_LION)
+ [o_info_window setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary];
[o_info_window setTitle: _NS("Media Information")];
[o_uri_lbl setStringValue: _NS("Location")];
[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)];
+ [o_encodedby_lbl setStringValue: _NS(VLC_META_ENCODED_BY)];
/* statistics */
- [o_input_box setTitle: _NS("Input")];
+ [o_input_lbl setStringValue: _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_lbl setStringValue: _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_fps_lbl setStringValue: _NS("Frames per Second")];
- [o_sout_box setTitle: _NS("Streaming")];
+ [o_sout_lbl setStringValue: _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_lbl setStringValue: _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")];
[self updatePanelWithItem:p_item];
}
-- (void)stopTimers
-{
- /* make sure that the timer is released in any case */
- if( o_statUpdateTimer && [o_statUpdateTimer isValid] )
- [o_statUpdateTimer invalidate];
-
- [rootItem release];
-
- [o_statUpdateTimer release];
- o_statUpdateTimer = nil;
-}
- (void)dealloc
{
- /* make sure that the timer is released in any case */
- if( o_statUpdateTimer && [o_statUpdateTimer isValid] )
- [o_statUpdateTimer invalidate];
-
- [o_statUpdateTimer release];
+ [rootItem release];
if( p_item ) vlc_gc_decref( p_item );
[super dealloc];
}
-- (void)windowDidBecomeKey:(NSNotification *)notification
-{
- BOOL b_stats = config_GetInt(VLCIntf, "stats");
- if( b_stats )
- {
- if( o_statUpdateTimer )
- {
- [o_statUpdateTimer invalidate];
- [o_statUpdateTimer release];
- o_statUpdateTimer = nil;
- }
- o_statUpdateTimer = [NSTimer scheduledTimerWithTimeInterval: 1
- target: self selector: @selector(updateStatistics:)
- userInfo: nil repeats: YES];
- [o_statUpdateTimer fire];
- [o_statUpdateTimer retain];
- }
-}
-
-- (BOOL)windowShouldClose:(id)sender
-{
- if( [o_statUpdateTimer isValid] )
- [o_statUpdateTimer invalidate];
-
- if( o_statUpdateTimer )
- [o_statUpdateTimer release];
- o_statUpdateTimer = nil;
- return YES;
-}
-
- (void)initPanel
{
BOOL b_stats = config_GetInt(VLCIntf, "stats");
- (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
[o_video_decoded_txt setIntValue:0];
[o_displayed_txt setIntValue:0];
[o_lost_frames_txt setIntValue:0];
- [o_fps_txt setFloatValue:0];
//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
- (void)updatePanelWithItem:(input_item_t *)_p_item;
{
+ NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
if( _p_item != p_item )
{
if( p_item ) vlc_gc_decref( p_item );
SET( language );
SET( date );
SET( description );
+ SET( encodedby );
#undef SET
[o_image_well setImage: [NSImage imageNamed: @"noart.png"]];
}
{
if( !input_item_IsPreparsed( p_item ) )
{
- playlist_t * p_playlist = pl_Hold( VLCIntf );
- PL_LOCK;
- playlist_PreparseEnqueue( p_playlist, p_item, pl_Locked );
- PL_UNLOCK;
- 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 : "" ]];
+ char * psz_url = decode_URI( input_item_GetURI( p_item ) );
+ [o_uri_txt setStringValue: [NSString stringWithUTF8String: psz_url ? psz_url : ""]];
free( psz_url );
/* fill title info */
SET( language, Language );
SET( date, Date );
SET( description, Description );
+ SET( encodedby, EncodedBy );
#undef SET
char *psz_meta;
NSImage *o_image;
psz_meta = input_item_GetArtURL( p_item );
- if( psz_meta && !strncmp( psz_meta, "file://", 7 ) && decode_URI( psz_meta + 7 ) )
- o_image = [[NSImage alloc] initWithContentsOfFile: [NSString stringWithUTF8String: psz_meta+7]];
+
+ /* 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];
[o_outline_view reloadData];
/* update the stats once to display p_item change faster */
- [self updateStatistics: nil];
+ [self updateStatistics];
+ [o_pool release];
}
- (void)setMeta: (char *)psz_meta forLabel: (id)theItem
[theItem setStringValue: @""];
}
-- (void)updateStatistics:(NSTimer*)theTimer
+- (void)updateStatistics
{
- if( !p_item || !p_item->p_stats )
+ if ([o_info_window isVisible])
{
- [self initMediaPanelStats];
- return;
- }
+ if( !p_item || !p_item->p_stats )
+ {
+ [self initMediaPanelStats];
+ return;
+ }
- vlc_mutex_lock( &p_item->p_stats->lock );
-
- /* input */
- [o_read_bytes_txt setStringValue: [NSString stringWithFormat:
- @"%8.0f kB", (float)(p_item->p_stats->i_read_bytes)/1000]];
- [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]];
- [o_demux_bitrate_txt setStringValue: [NSString stringWithFormat:
- @"%6.0f kb/s", (float)(p_item->p_stats->f_demux_bitrate)*8000]];
-
- /* Video */
- [o_video_decoded_txt setIntValue: p_item->p_stats->i_decoded_video];
- [o_displayed_txt setIntValue: p_item->p_stats->i_displayed_pictures];
- [o_lost_frames_txt setIntValue: p_item->p_stats->i_lost_pictures];
- float f_fps = 0;
- /* FIXME: input_Control( p_item, INPUT_GET_VIDEO_FPS, &f_fps ); */
- [o_fps_txt setFloatValue: f_fps];
-
- /* 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_bitrate_txt setStringValue: [NSString stringWithFormat:
- @"%6.0f kb/s", (float)(p_item->p_stats->f_send_bitrate*8)*1000]];
-
- /* Audio */
- [o_audio_decoded_txt setIntValue: p_item->p_stats->i_decoded_audio];
- [o_played_abuffers_txt setIntValue: p_item->p_stats->i_played_abuffers];
- [o_lost_abuffers_txt setIntValue: p_item->p_stats->i_lost_abuffers];
-
- vlc_mutex_unlock( &p_item->p_stats->lock );
+ vlc_mutex_lock( &p_item->p_stats->lock );
+
+ /* input */
+ [o_read_bytes_txt setStringValue: [NSString stringWithFormat:
+ @"%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 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]];
+
+ /* Video */
+ [o_video_decoded_txt setIntValue: p_item->p_stats->i_decoded_video];
+ [o_displayed_txt setIntValue: p_item->p_stats->i_displayed_pictures];
+ [o_lost_frames_txt setIntValue: p_item->p_stats->i_lost_pictures];
+
+ /* Sout */
+ [o_sent_packets_txt setIntValue: p_item->p_stats->i_sent_packets];
+ [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]];
+
+ /* Audio */
+ [o_audio_decoded_txt setIntValue: p_item->p_stats->i_decoded_audio];
+ [o_played_abuffers_txt setIntValue: p_item->p_stats->i_played_abuffers];
+ [o_lost_abuffers_txt setIntValue: p_item->p_stats->i_lost_abuffers];
+
+ vlc_mutex_unlock( &p_item->p_stats->lock );
+ }
}
- (IBAction)metaFieldChanged:(id)sender
- (IBAction)saveMetaData:(id)sender
{
- playlist_t * p_playlist = pl_Hold( 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, false );
- 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("VLC was unable to save the meta data."),
_NS("OK"), nil, nil);
- (IBAction)downloadCoverArt:(id)sender
{
- playlist_t * p_playlist = pl_Hold( VLCIntf );
- if( p_item) playlist_AskForArtEnqueue( p_playlist, p_item, pl_Unlocked );
- pl_Release( VLCIntf );
+ playlist_t * p_playlist = pl_Get( VLCIntf );
+ if( p_item) playlist_AskForArtEnqueue( p_playlist, p_item );
}
- (input_item_t *)item
o_children = nil;
}
-- (VLCInfoTreeItem *)childAtIndex:(int)i_index {
+- (VLCInfoTreeItem *)childAtIndex:(NSUInteger)i_index {
return [[self children] objectAtIndex:i_index];
}
projects / vlc / blobdiff