Commit c721c836 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

MacOSX/Framework: No more rely on media_descriptor_(get/set)_user_data, now...

MacOSX/Framework: No more rely on media_descriptor_(get/set)_user_data, now that we cache the media decriptor. (We may want to revert that back one day, but right now this doesn't work, and trigger some strange bugs here).
parent 5f5081a5
...@@ -179,9 +179,6 @@ static void HandleMediaDurationChanged(const libvlc_event_t *event, void *self) ...@@ -179,9 +179,6 @@ static void HandleMediaDurationChanged(const libvlc_event_t *event, void *self)
[subitems release]; [subitems release];
[metaDictionary release]; [metaDictionary release];
if( self == libvlc_media_descriptor_get_user_data( p_md, NULL ) )
libvlc_media_descriptor_set_user_data( p_md, nil, NULL );
libvlc_media_descriptor_release( p_md ); libvlc_media_descriptor_release( p_md );
[super dealloc]; [super dealloc];
...@@ -280,35 +277,15 @@ static void HandleMediaDurationChanged(const libvlc_event_t *event, void *self) ...@@ -280,35 +277,15 @@ static void HandleMediaDurationChanged(const libvlc_event_t *event, void *self)
+ (id)mediaWithLibVLCMediaDescriptor:(void *)md + (id)mediaWithLibVLCMediaDescriptor:(void *)md
{ {
libvlc_exception_t ex;
libvlc_exception_init( &ex );
VLCMedia *media = (VLCMedia *)libvlc_media_descriptor_get_user_data( md, &ex );
if (!media || libvlc_exception_raised( &ex ))
{
libvlc_exception_clear( &ex );
return [[[VLCMedia alloc] initWithLibVLCMediaDescriptor:md] autorelease]; return [[[VLCMedia alloc] initWithLibVLCMediaDescriptor:md] autorelease];
}
return media;
} }
- (id)initWithLibVLCMediaDescriptor:(void *)md - (id)initWithLibVLCMediaDescriptor:(void *)md
{ {
libvlc_exception_t ex;
libvlc_exception_init( &ex );
// Core hacks that allows for native objects to be paired with core objects. Otherwise, a native object
// would be recreated every time we want to address the media descriptor. This eliminates the need
// for maintaining local copies of core objects.
if ((self = (id)libvlc_media_descriptor_get_user_data(md, &ex)) && !libvlc_exception_raised(&ex))
{
return [self retain];
}
libvlc_exception_clear( &ex ); // Just in case an exception was raised, lets release it
if (self = [super init]) if (self = [super init])
{ {
libvlc_exception_t ex;
libvlc_exception_init( &ex );
char * p_url; char * p_url;
p_url = libvlc_media_descriptor_get_mrl( md, &ex ); p_url = libvlc_media_descriptor_get_mrl( md, &ex );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment