[pool release];
}
-//static void HandleMediaDurationChanged(const libvlc_event_t * event, void * self)
-//{
-// NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-//
-// [[VLCEventManager sharedManager] callOnMainThreadObject:self
-// withMethod:@selector(setLength:)
-// withArgumentAsObject:[VLCTime timeWithNumber:
-// [NSNumber numberWithLongLong:event->u.media_duration_changed.new_duration]]];
-// [pool release];
-//}
+static void HandleMediaDurationChanged(const libvlc_event_t * event, void * self)
+{
+ NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+
+ [[VLCEventManager sharedManager] callOnMainThreadObject:self
+ withMethod:@selector(setLength:)
+ withArgumentAsObject:[VLCTime timeWithNumber:
+ [NSNumber numberWithLongLong:event->u.media_duration_changed.new_duration]]];
+ [pool release];
+}
static void HandleMediaStateChanged(const libvlc_event_t * event, void * self)
{
NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-
+
[[VLCEventManager sharedManager] callOnMainThreadObject:self
withMethod:@selector(setStateAsNumber:)
withArgumentAsObject:[NSNumber numberWithInt:
}
- (id)initWithURL:(NSURL *)anURL
-{
+{
if (self = [super init])
{
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- p_md = libvlc_media_new([VLCLibrary sharedInstance],
- [[anURL absoluteString] UTF8String],
- &ex);
- catch_exception(&ex);
-
+ p_md = libvlc_media_new_location([VLCLibrary sharedInstance],
+ [[anURL absoluteString] UTF8String]);
+
delegate = nil;
metaDictionary = [[NSMutableDictionary alloc] initWithCapacity:3];
-
+
// This value is set whenever the demuxer figures out what the length is.
// TODO: Easy way to tell the length of the movie without having to instiate the demuxer. Maybe cached info?
length = nil;
}
- (id)initAsNodeWithName:(NSString *)aName
-{
+{
if (self = [super init])
{
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
p_md = libvlc_media_new_as_node([VLCLibrary sharedInstance],
- [aName UTF8String],
- &ex);
- catch_exception(&ex);
+ [aName UTF8String]);
delegate = nil;
metaDictionary = [[NSMutableDictionary alloc] initWithCapacity:3];
-
+
// This value is set whenever the demuxer figures out what the length is.
// TODO: Easy way to tell the length of the movie without having to instiate the demuxer. Maybe cached info?
length = nil;
-
+
[self initInternalMediaDescriptor];
}
return self;
}
+- (void)setValue:(NSString *)value forMeta:(NSString *)meta
+{
+ libvlc_meta_t metaName = [VLCMedia stringToMetaType:meta];
+ NSAssert(metaName >= 0, @"Invalid meta");
+ libvlc_media_set_meta(p_md, metaName, [value UTF8String]);
+}
+
- (void)release
{
@synchronized(self)
* We also may receive a -retain in some event callback that may occcur
* Before libvlc_event_detach. So this can't happen in dealloc */
libvlc_event_manager_t * p_em = libvlc_media_event_manager(p_md);
- libvlc_event_detach(p_em, libvlc_MediaMetaChanged, HandleMediaMetaChanged, self, NULL);
-// libvlc_event_detach(p_em, libvlc_MediaDurationChanged, HandleMediaDurationChanged, self, NULL);
- libvlc_event_detach(p_em, libvlc_MediaStateChanged, HandleMediaStateChanged, self, NULL);
- libvlc_event_detach(p_em, libvlc_MediaSubItemAdded, HandleMediaSubItemAdded, self, NULL);
+ libvlc_event_detach(p_em, libvlc_MediaMetaChanged, HandleMediaMetaChanged, self);
+ libvlc_event_detach(p_em, libvlc_MediaDurationChanged, HandleMediaDurationChanged, self);
+ libvlc_event_detach(p_em, libvlc_MediaStateChanged, HandleMediaStateChanged, self);
+ libvlc_event_detach(p_em, libvlc_MediaSubItemAdded, HandleMediaSubItemAdded, self);
}
[super release];
}
// Testing to see if the pointer exists is not required, if the pointer is null
// then the release message is not sent to it.
delegate = nil;
- [self setLength:nil];
-
+ [length release];
[url release];
[subitems release];
[metaDictionary release];
- (VLCTime *)length
{
- if (!length)
+ if (!length)
{
// Try figuring out what the length is
- long long duration = libvlc_media_get_duration( p_md, NULL );
- if (duration > -1)
+ long long duration = libvlc_media_get_duration( p_md );
+ if (duration > -1)
{
- [self setLength:[VLCTime timeWithNumber:[NSNumber numberWithLongLong:duration]]];
+ length = [[VLCTime timeWithNumber:[NSNumber numberWithLongLong:duration]] retain];
return [[length retain] autorelease];
- }
+ }
+ return [VLCTime nullTime];
}
- return [VLCTime nullTime];
+ return [[length retain] autorelease];
}
- (VLCTime *)lengthWaitUntilDate:(NSDate *)aDate
if (!length)
{
- while (!length && ![self isPreparsed] && [aDate timeIntervalSinceNow] > 0)
+ // Force preparsing of this item.
+ [self length];
+
+ // wait until we are preparsed
+ while (!length && ![self isParsed] && [aDate timeIntervalSinceNow] > 0)
{
usleep( thread_sleep );
}
-
+
// So we're done waiting, but sometimes we trap the fact that the parsing
// was done before the length gets assigned, so lets go ahead and assign
// it ourselves.
return [[length retain] autorelease];
}
-- (BOOL)isPreparsed
+- (BOOL)isParsed
{
- return libvlc_media_is_preparsed( p_md );
+ return libvlc_media_is_parsed( p_md );
}
@synthesize url;
{
libvlc_media_retain( md );
p_md = md;
-
+
metaDictionary = [[NSMutableDictionary alloc] initWithCapacity:3];
[self initInternalMediaDescriptor];
}
return self;
}
-- (void *)libVLCMediaDescriptor
+- (void *)libVLCMediaDescriptor
{
return p_md;
}
{
libvlc_media_t * p_md;
p_md = libvlc_media_duplicate( [media libVLCMediaDescriptor] );
+
for( NSString * key in [options allKeys] )
{
libvlc_media_add_option(p_md, [[NSString stringWithFormat:@"%@=#%@", key, [options objectForKey:key]] UTF8String]);
- (void)initInternalMediaDescriptor
{
- libvlc_exception_t ex;
- libvlc_exception_init( &ex );
-
- artFetched = NO;
-
char * p_url = libvlc_media_get_mrl( p_md );
url = [[NSURL URLWithString:[NSString stringWithUTF8String:p_url]] retain];
libvlc_media_set_user_data( p_md, (void*)self );
libvlc_event_manager_t * p_em = libvlc_media_event_manager( p_md );
- libvlc_event_attach(p_em, libvlc_MediaMetaChanged, HandleMediaMetaChanged, self, &ex);
-// libvlc_event_attach(p_em, libvlc_MediaDurationChanged, HandleMediaDurationChanged, self, &ex);
- libvlc_event_attach(p_em, libvlc_MediaStateChanged, HandleMediaStateChanged, self, &ex);
- libvlc_event_attach(p_em, libvlc_MediaSubItemAdded, HandleMediaSubItemAdded, self, &ex);
-
+ libvlc_event_attach(p_em, libvlc_MediaMetaChanged, HandleMediaMetaChanged, self);
+ libvlc_event_attach(p_em, libvlc_MediaDurationChanged, HandleMediaDurationChanged, self);
+ libvlc_event_attach(p_em, libvlc_MediaStateChanged, HandleMediaStateChanged, self);
+ libvlc_event_attach(p_em, libvlc_MediaSubItemAdded, HandleMediaSubItemAdded, self);
+
libvlc_media_list_t * p_mlist = libvlc_media_subitems( p_md );
if (!p_mlist)
}
state = LibVLCStateToMediaState(libvlc_media_get_state( p_md ));
-
- /* Force VLCMetaInformationTitle, that will trigger preparsing
- * And all the other meta will be added through the libvlc event system */
- [self fetchMetaInformationFromLibVLCWithType: VLCMetaInformationTitle];
}
- (void)fetchMetaInformationFromLibVLCWithType:(NSString *)metaType
if ( newValue != oldValue && !(oldValue && newValue && [oldValue compare:newValue] == NSOrderedSame) )
{
- if ([metaType isEqualToString:VLCMetaInformationArtworkURL])
+ // Only fetch the art if needed. (ie, create the NSImage, if it was requested before)
+ if (isArtFetched && [metaType isEqualToString:VLCMetaInformationArtworkURL])
{
- [NSThread detachNewThreadSelector:@selector(fetchMetaInformationForArtWorkWithURL:)
+ [NSThread detachNewThreadSelector:@selector(fetchMetaInformationForArtWorkWithURL:)
toTarget:self
withObject:newValue];
- return;
}
[metaDictionary setValue:newValue forKeyPath:metaType];
// Don't attempt to fetch artwork from remote. Core will do that alone
if ([artUrl isFileURL])
- art = [[[NSImage alloc] initWithContentsOfURL:artUrl] autorelease];
+ art = [[[NSImage alloc] initWithContentsOfURL:artUrl] autorelease];
}
// If anything was found, lets save it to the meta data dictionary
- (id)valueForKeyPath:(NSString *)keyPath
{
- if( !artFetched && [keyPath isEqualToString:@"metaDictionary.artwork"])
+ if( !isArtFetched && [keyPath isEqualToString:@"metaDictionary.artwork"])
{
- artFetched = YES;
+ isArtFetched = YES;
/* Force the retrieval of the artwork now that someone asked for it */
[self fetchMetaInformationFromLibVLCWithType: VLCMetaInformationArtworkURL];
}
+ else if( !areOthersMetaFetched && [keyPath hasPrefix:@"metaDictionary."])
+ {
+ areOthersMetaFetched = YES;
+ /* Force VLCMetaInformationTitle, that will trigger preparsing
+ * And all the other meta will be added through the libvlc event system */
+ [self fetchMetaInformationFromLibVLCWithType: VLCMetaInformationTitle];
+
+ }
+ else if( !isArtURLFetched && [keyPath hasPrefix:@"metaDictionary.artworkURL"])
+ {
+ isArtURLFetched = YES;
+ /* Force isArtURLFetched, that will trigger artwork download eventually
+ * And all the other meta will be added through the libvlc event system */
+ [self fetchMetaInformationFromLibVLCWithType: VLCMetaInformationArtworkURL];
+ }
+
return [super valueForKeyPath:keyPath];
}
@end
{
if (length && value && [length compare:value] == NSOrderedSame)
return;
-
- [length release];
+
+ [length release];
length = value ? [value retain] : nil;
}
projects / vlc / blobdiff