From 390c421ffe99baba80b2798e4e067d5a58a984ad Mon Sep 17 00:00:00 2001
From: Carola Nitz <nitz.carola@googlemail.com>
Date: Sat, 12 Aug 2017 15:34:26 +0200
Subject: [PATCH] remove blurcategory again from watch since the accelerate
framework is only available on watchOS 4 and crashed on all older watches
---
Sources/VLCThumbnailsCache.m | 6 +++++-
VLC.xcodeproj/project.pbxproj | 2 --
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Sources/VLCThumbnailsCache.m b/Sources/VLCThumbnailsCache.m
index 7c17dcc21..ebad9d787 100644
--- a/Sources/VLCThumbnailsCache.m
+++ b/Sources/VLCThumbnailsCache.m
@@ -326,8 +326,12 @@
if (!blurImage)
return clusterThumb;
-
+// TODO: When we move to watch os 4.0 we can include the blurcategory and remove the if else block
+#ifndef TARGET_OS_WATCH
return [UIImage applyBlurOnImage:clusterThumb withRadius:0.1];
+#else
+ return clusterThumb;
+#endif
}
@end
diff --git a/VLC.xcodeproj/project.pbxproj b/VLC.xcodeproj/project.pbxproj
index b5bbbcdf0..bfb605c0e 100644
--- a/VLC.xcodeproj/project.pbxproj
+++ b/VLC.xcodeproj/project.pbxproj
@@ -45,7 +45,6 @@
41B93C011A53833B00102E8B /* VLCProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = 41B93C001A53833B00102E8B /* VLCProgressView.m */; };
41B93C051A53835300102E8B /* VLCCloudServiceCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 41B93C031A53835300102E8B /* VLCCloudServiceCell.m */; };
41B93C081A53853B00102E8B /* VLCCloudServiceCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 41B93C071A53853B00102E8B /* VLCCloudServiceCell.xib */; };
- 41BBDCBD1F3BAFF000B89A9C /* UIImage+Blur.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D168F7318D4A33F003FAF59 /* UIImage+Blur.m */; };
41CD695C1A29D72600E60BCE /* VLCBoxController.m in Sources */ = {isa = PBXBuildFile; fileRef = 41CD69591A29D72600E60BCE /* VLCBoxController.m */; };
41CD695D1A29D72600E60BCE /* VLCBoxTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 41CD695B1A29D72600E60BCE /* VLCBoxTableViewController.m */; };
6A804FA9706D38FB40A4136A /* libPods-VLC-watchOS-Extension.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F82CE64560C0AD3059DAAFC /* libPods-VLC-watchOS-Extension.a */; };
@@ -4850,7 +4849,6 @@
DD2789DE1B67A5CD00CED769 /* VLCWatchMessage.m in Sources */,
DD3567F71B6768FC00338947 /* VLCRowController.m in Sources */,
DD3567F21B6768FC00338947 /* VLCBaseInterfaceController.m in Sources */,
- 41BBDCBD1F3BAFF000B89A9C /* UIImage+Blur.m in Sources */,
DD2789DD1B67A5C400CED769 /* VLCThumbnailsCache.m in Sources */,
DD3567F51B6768FC00338947 /* VLCNowPlayingInterfaceController.m in Sources */,
);
--
GitLab