Merge pull request #5 from ragnaringi/ios_native

iOS native
ragnaringi · Aug 30, 2018 · b201097 · b201097
2 parents 1c99015 + 52b9e31
commit b201097
Show file tree

Hide file tree

Showing 8 changed files with 260 additions and 711 deletions.
diff --git a/ESMusicExtractor.xcodeproj/project.pbxproj b/ESMusicExtractor.xcodeproj/project.pbxproj
diff --git a/src/ESExtractor.mm b/src/ESExtractor.mm
@@ -13,10 +13,12 @@ @implementation ESExtractor
 
 - (NSDictionary *)analyseTrack:(NSURL *)url {
   essentia_main(url.path.UTF8String, [self tempFile].path.UTF8String, "");
-  return ({
-    NSData* data = [NSData dataWithContentsOfURL:[self tempFile]];
-    [NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:nil];
-  });
+  NSData* data = [NSData dataWithContentsOfURL:[self tempFile]];
+  @try {
+    return [NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:nil];
+  } @catch (NSException *exception) {
+    return nil;
+  }
 }
 
 - (NSURL *)tempFile {

diff --git a/src/internal/taglib_config.h → src/internal/3rdparty/taglib_config.h b/src/internal/taglib_config.h → src/internal/3rdparty/taglib_config.h
diff --git a/src/internal/version.h → src/internal/3rdparty/version.h b/src/internal/version.h → src/internal/3rdparty/version.h