Commit c14e40ae authored by Felix Paul Kühne's avatar Felix Paul Kühne

VLCMedia: do not enforce deprecated and discouraged synchronous parsing if...

VLCMedia: do not enforce deprecated and discouraged synchronous parsing if media was not parsed yet on metadata request

(cherry picked from commit 79e22d2d)
parent 242ff810
...@@ -46,6 +46,8 @@ New APIs: ...@@ -46,6 +46,8 @@ New APIs:
parseWithOptions:Timeout: parseWithOptions:Timeout:
parsedStatus parsedStatus
- added enums: VLCMediaType, VLCMediaParsingOptions, VLCMediaParsedStatus - added enums: VLCMediaType, VLCMediaParsingOptions, VLCMediaParsedStatus
- changed behavior: media will no longer be parsed automatically if meta
data is requested prior to concluded parsing
- VLCTime - VLCTime
- added selectors: isEqual: - added selectors: isEqual:
......
...@@ -345,10 +345,10 @@ static void HandleMediaParsedChanged(const libvlc_event_t * event, void * self) ...@@ -345,10 +345,10 @@ static void HandleMediaParsedChanged(const libvlc_event_t * event, void * self)
- (VLCMediaParsedStatus)parsedStatus - (VLCMediaParsedStatus)parsedStatus
{ {
if ( !p_md ) if (!p_md)
return VLCMediaParsedStatusFailed; return VLCMediaParsedStatusFailed;
libvlc_media_parsed_status_t status = libvlc_media_get_parsed_status(p_md); libvlc_media_parsed_status_t status = libvlc_media_get_parsed_status(p_md);
return (VLCMediaParsedStatus)status; return (VLCMediaParsedStatus)status;
} }
- (void)parse - (void)parse
...@@ -739,10 +739,6 @@ NSString *const VLCMediaTracksInformationTextEncoding = @"encoding"; // NSString ...@@ -739,10 +739,6 @@ NSString *const VLCMediaTracksInformationTextEncoding = @"encoding"; // NSString
if (!p_md) if (!p_md)
return nil; return nil;
VLCMediaParsedStatus parsedStatus = [self parsedStatus];
if (parsedStatus == VLCMediaParsedStatusSkipped || parsedStatus == VLCMediaParsedStatusInit)
[self synchronousParse];
char *returnValue = libvlc_media_get_meta(p_md, [VLCMedia stringToMetaType:key]); char *returnValue = libvlc_media_get_meta(p_md, [VLCMedia stringToMetaType:key]);
if (!returnValue) if (!returnValue)
......
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