/*****************************************************************************
- * VLCMedia.m: VLC.framework VLCMedia implementation
+ * VLCMedia.m: VLCKit.framework VLCMedia implementation
*****************************************************************************
* Copyright (C) 2007 Pierre d'Herbemont
* Copyright (C) 2007 the VideoLAN team
*/
static void HandleMediaMetaChanged(const libvlc_event_t * event, void * self)
{
- if( event->u.media_descriptor_meta_changed.meta_type == libvlc_meta_Publisher ||
- event->u.media_descriptor_meta_changed.meta_type == libvlc_meta_NowPlaying )
+ if( event->u.media_meta_changed.meta_type == libvlc_meta_Publisher ||
+ event->u.media_meta_changed.meta_type == libvlc_meta_NowPlaying )
{
/* Skip those meta. We don't really care about them for now.
* And they occure a lot */
NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
[[VLCEventManager sharedManager] callOnMainThreadObject:self
withMethod:@selector(metaChanged:)
- withArgumentAsObject:[VLCMedia metaTypeToString:event->u.media_descriptor_meta_changed.meta_type]];
+ withArgumentAsObject:[VLCMedia metaTypeToString:event->u.media_meta_changed.meta_type]];
[pool release];
}
// [[VLCEventManager sharedManager] callOnMainThreadObject:self
// withMethod:@selector(setLength:)
// withArgumentAsObject:[VLCTime timeWithNumber:
-// [NSNumber numberWithLongLong:event->u.media_descriptor_duration_changed.new_duration]]];
+// [NSNumber numberWithLongLong:event->u.media_duration_changed.new_duration]]];
// [pool release];
//}
[[VLCEventManager sharedManager] callOnMainThreadObject:self
withMethod:@selector(setStateAsNumber:)
withArgumentAsObject:[NSNumber numberWithInt:
- LibVLCStateToMediaState(event->u.media_descriptor_state_changed.new_state)]];
+ LibVLCStateToMediaState(event->u.media_state_changed.new_state)]];
[pool release];
}
return [[[VLCMedia alloc] initAsNodeWithName:aName] autorelease];
}
-- (id)initWithURL:(NSURL *)anURL
+- (id)initWithPath:(NSString *)aPath
{
- return [self initWithPath:[anURL path]];
+ return [self initWithURL:[NSURL fileURLWithPath:aPath isDirectory:NO]];
}
-- (id)initWithPath:(NSString *)aPath
+- (id)initWithURL:(NSURL *)anURL
{
if (self = [super init])
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- p_md = libvlc_media_descriptor_new([VLCLibrary sharedInstance],
- [aPath UTF8String],
+ p_md = libvlc_media_new([VLCLibrary sharedInstance],
+ [[anURL absoluteString] UTF8String],
&ex);
catch_exception(&ex);
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- p_md = libvlc_media_descriptor_new_as_node([VLCLibrary sharedInstance],
+ p_md = libvlc_media_new_as_node([VLCLibrary sharedInstance],
[aName UTF8String],
&ex);
catch_exception(&ex);
/* We must make sure we won't receive new event after an upcoming dealloc
* 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_descriptor_event_manager(p_md, NULL);
- libvlc_event_detach(p_em, libvlc_MediaDescriptorMetaChanged, HandleMediaMetaChanged, self, NULL);
-// libvlc_event_detach(p_em, libvlc_MediaDescriptorDurationChanged, HandleMediaDurationChanged, self, NULL);
- libvlc_event_detach(p_em, libvlc_MediaDescriptorStateChanged, HandleMediaStateChanged, self, NULL);
- libvlc_event_detach(p_em, libvlc_MediaDescriptorSubItemAdded, HandleMediaSubItemAdded, self, NULL);
+ 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);
}
[super release];
}
[subitems release];
[metaDictionary release];
- libvlc_media_descriptor_release( p_md );
+ libvlc_media_release( p_md );
[super dealloc];
}
if (!length)
{
// Try figuring out what the length is
- long long duration = libvlc_media_descriptor_get_duration( p_md, NULL );
+ long long duration = libvlc_media_get_duration( p_md, NULL );
if (duration > -1)
{
[self setLength:[VLCTime timeWithNumber:[NSNumber numberWithLongLong:duration]]];
return [[length retain] autorelease];
- }
+ }
+ return [VLCTime nullTime];
}
- return [VLCTime nullTime];
+ return [[length retain] autorelease];
}
- (VLCTime *)lengthWaitUntilDate:(NSDate *)aDate
- (BOOL)isPreparsed
{
- return libvlc_media_descriptor_is_preparsed( p_md, NULL );
+ return libvlc_media_is_preparsed( p_md );
}
@synthesize url;
{
if (self = [super init])
{
- libvlc_exception_t ex;
- libvlc_exception_init( &ex );
-
- libvlc_media_descriptor_retain( md );
+ libvlc_media_retain( md );
p_md = md;
metaDictionary = [[NSMutableDictionary alloc] initWithCapacity:3];
+ (id)mediaWithMedia:(VLCMedia *)media andLibVLCOptions:(NSDictionary *)options
{
- libvlc_media_descriptor_t * p_md;
- p_md = libvlc_media_descriptor_duplicate( [media libVLCMediaDescriptor] );
+ libvlc_media_t * p_md;
+ p_md = libvlc_media_duplicate( [media libVLCMediaDescriptor] );
+
for( NSString * key in [options allKeys] )
{
- libvlc_media_descriptor_add_option(p_md, [[NSString stringWithFormat:@"%@=#%@", key, [options objectForKey:key]] UTF8String], NULL);
+ libvlc_media_add_option(p_md, [[NSString stringWithFormat:@"%@=#%@", key, [options objectForKey:key]] UTF8String]);
}
return [VLCMedia mediaWithLibVLCMediaDescriptor:p_md];
}
libvlc_exception_t ex;
libvlc_exception_init( &ex );
- artFetched = NO;
-
- char * p_url = libvlc_media_descriptor_get_mrl( p_md, &ex );
- catch_exception( &ex );
+ char * p_url = libvlc_media_get_mrl( p_md );
url = [[NSURL URLWithString:[NSString stringWithUTF8String:p_url]] retain];
if( !url ) /* Attempt to interpret as a file path then */
url = [[NSURL fileURLWithPath:[NSString stringWithUTF8String:p_url]] retain];
free( p_url );
- libvlc_media_descriptor_set_user_data( p_md, (void*)self, &ex );
- catch_exception( &ex );
+ libvlc_media_set_user_data( p_md, (void*)self );
- libvlc_event_manager_t * p_em = libvlc_media_descriptor_event_manager( p_md, &ex );
- libvlc_event_attach(p_em, libvlc_MediaDescriptorMetaChanged, HandleMediaMetaChanged, self, &ex);
-// libvlc_event_attach(p_em, libvlc_MediaDescriptorDurationChanged, HandleMediaDurationChanged, self, &ex);
- libvlc_event_attach(p_em, libvlc_MediaDescriptorStateChanged, HandleMediaStateChanged, self, &ex);
- libvlc_event_attach(p_em, libvlc_MediaDescriptorSubItemAdded, HandleMediaSubItemAdded, self, &ex);
- catch_exception( &ex );
+ 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_media_list_t * p_mlist = libvlc_media_descriptor_subitems( p_md, NULL );
+ libvlc_media_list_t * p_mlist = libvlc_media_subitems( p_md );
if (!p_mlist)
subitems = nil;
libvlc_media_list_release( p_mlist );
}
- state = LibVLCStateToMediaState(libvlc_media_descriptor_get_state( p_md, NULL ));
-
- /* Force VLCMetaInformationTitle, that will trigger preparsing
- * And all the other meta will be added through the libvlc event system */
- [self fetchMetaInformationFromLibVLCWithType: VLCMetaInformationTitle];
+ state = LibVLCStateToMediaState(libvlc_media_get_state( p_md ));
}
- (void)fetchMetaInformationFromLibVLCWithType:(NSString *)metaType
{
- char * psz_value = libvlc_media_descriptor_get_meta( p_md, [VLCMedia stringToMetaType:metaType], NULL);
+ char * psz_value = libvlc_media_get_meta( p_md, [VLCMedia stringToMetaType:metaType] );
NSString * newValue = psz_value ? [NSString stringWithUTF8String: psz_value] : nil;
NSString * oldValue = [metaDictionary valueForKey:metaType];
free(psz_value);
if( subitems )
return; /* Nothing to do */
- libvlc_media_list_t * p_mlist = libvlc_media_descriptor_subitems( p_md, NULL );
+ libvlc_media_list_t * p_mlist = libvlc_media_subitems( p_md );
NSAssert( p_mlist, @"The mlist shouldn't be nil, we are receiving a subItemAdded");
- (id)valueForKeyPath:(NSString *)keyPath
{
- if( ![metaDictionary objectForKey:@"artwork"] && [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];
+ }
+
return [super valueForKeyPath:keyPath];
}
@end
projects / vlc / blobdiff