Commit f459c271 authored by Malte Tancred's avatar Malte Tancred Committed by Derk-Jan Hartman

VLCKit: url support for VLCMedia

The class VLCMedia used only the trailing path part of the URL it was handed. I changed the roles of initWithPath: and initWithURL: by letting initWithPath: create an NSURL, and initWithURL: hand the complete URL to libvlc_media_new. With this change I'm able to play network streams, not just local movie files.
Signed-off-by: default avatarDerk-Jan Hartman <hartman@videolan.org>
parent cb2a5b49
...@@ -178,6 +178,7 @@ Ludovic Fauvet <etix # l0cal dot com> - Qt4 patch ...@@ -178,6 +178,7 @@ Ludovic Fauvet <etix # l0cal dot com> - Qt4 patch
Lukas Durfina <lukas.durfina at gmail.com> - Qt4: full screen controller. Teletext button fix. Various fixes. Lukas Durfina <lukas.durfina at gmail.com> - Qt4: full screen controller. Teletext button fix. Various fixes.
Luqman Hakim <ovdl qt rocketmail dot com> - Indonesian translation Luqman Hakim <ovdl qt rocketmail dot com> - Indonesian translation
Mahrazi Mohd Kamal <mahrazi at gmail.com> - Malay Translation Mahrazi Mohd Kamal <mahrazi at gmail.com> - Malay Translation
Malte Tancred <malte at frontbase dot com> - VLCKit patch for URLs
Marc Nolette <nolette at videotron.ca> - PVR support in DirectShow input Marc Nolette <nolette at videotron.ca> - PVR support in DirectShow input
Marco Munderloh <Marco.Munderloh at web.de> - HTTP fix for Win32 to URL filenames Marco Munderloh <Marco.Munderloh at web.de> - HTTP fix for Win32 to URL filenames
Marián Hikaník <podnety _at_ mojepreklady _dot_ net> - Slovak localisation Marián Hikaník <podnety _at_ mojepreklady _dot_ net> - Slovak localisation
......
...@@ -168,12 +168,12 @@ static void HandleMediaSubItemAdded(const libvlc_event_t * event, void * self) ...@@ -168,12 +168,12 @@ static void HandleMediaSubItemAdded(const libvlc_event_t * event, void * self)
return [[[VLCMedia alloc] initAsNodeWithName:aName] autorelease]; 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]) if (self = [super init])
{ {
...@@ -181,7 +181,7 @@ static void HandleMediaSubItemAdded(const libvlc_event_t * event, void * self) ...@@ -181,7 +181,7 @@ static void HandleMediaSubItemAdded(const libvlc_event_t * event, void * self)
libvlc_exception_init(&ex); libvlc_exception_init(&ex);
p_md = libvlc_media_new([VLCLibrary sharedInstance], p_md = libvlc_media_new([VLCLibrary sharedInstance],
[aPath UTF8String], [[anURL absoluteString] UTF8String],
&ex); &ex);
catch_exception(&ex); catch_exception(&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