From 2639f53d2dcbcbaec0f4f4e97b0c0c6533b9a500 Mon Sep 17 00:00:00 2001 From: Bart den Hollander Date: Sat, 4 Nov 2017 13:17:01 +0100 Subject: [PATCH] include NPOStream instead of development dependency, updated Readme --- NPO Live/PlayerViewController.swift | 9 +- NPO Live/String+Extension.swift | 53 ----- Podfile | 3 +- Podfile.lock | 10 +- Pods/Manifest.lock | 10 +- Pods/NPOStream/LICENSE | 7 + Pods/NPOStream/NPOStream/Channel.swift | 21 ++ .../NPOStream/NPOStream/ChannelProvider.swift | 83 ++++++++ Pods/NPOStream/NPOStream/Info.plist | 24 +++ Pods/NPOStream/NPOStream/NPOStream.h | 19 ++ Pods/NPOStream/NPOStream/NPOStream.swift | 63 ++++++ Pods/NPOStream/NPOStream/NPOStreamError.swift | 13 ++ Pods/NPOStream/NPOStream/Result.swift | 25 +++ .../NPOStream/String+Extension.swift | 43 ++++ Pods/NPOStream/README.md | 35 ++++ Pods/Pods.xcodeproj/project.pbxproj | 186 ++++++++---------- .../NPOStream/NPOStream.xcconfig | 2 +- README.md | 34 +++- 18 files changed, 458 insertions(+), 182 deletions(-) create mode 100644 Pods/NPOStream/LICENSE create mode 100644 Pods/NPOStream/NPOStream/Channel.swift create mode 100644 Pods/NPOStream/NPOStream/ChannelProvider.swift create mode 100644 Pods/NPOStream/NPOStream/Info.plist create mode 100644 Pods/NPOStream/NPOStream/NPOStream.h create mode 100644 Pods/NPOStream/NPOStream/NPOStream.swift create mode 100644 Pods/NPOStream/NPOStream/NPOStreamError.swift create mode 100644 Pods/NPOStream/NPOStream/Result.swift create mode 100755 Pods/NPOStream/NPOStream/String+Extension.swift create mode 100644 Pods/NPOStream/README.md diff --git a/NPO Live/PlayerViewController.swift b/NPO Live/PlayerViewController.swift index 99d7d32..f3574b3 100755 --- a/NPO Live/PlayerViewController.swift +++ b/NPO Live/PlayerViewController.swift @@ -25,14 +25,17 @@ class PlayerViewController: AVPlayerViewController { playerItem.externalMetadata.append(titleMetadataItem) - if let image = UIImage(named: channel.title) { + if + let image = UIImage(named: channel.title) { let logo: AVMetadataItem = { let _logo = AVMutableMetadataItem() _logo.locale = Locale.current _logo.key = AVMetadataKey.commonKeyArtwork as NSCopying & NSObjectProtocol _logo.keySpace = AVMetadataKeySpace.common - _logo.value = UIImagePNGRepresentation(image) as? NSCopying & NSObjectProtocol - + if let imagePNG = UIImagePNGRepresentation(image) { + _logo.value = imagePNG as NSCopying & NSObjectProtocol + } + return _logo }() diff --git a/NPO Live/String+Extension.swift b/NPO Live/String+Extension.swift index 8919603..66f1886 100755 --- a/NPO Live/String+Extension.swift +++ b/NPO Live/String+Extension.swift @@ -9,61 +9,8 @@ import Foundation extension String { - - func sliceFrom(_ start: String, to: String) -> String? { - return (range(of: start)?.upperBound) - .flatMap { sInd in - (range(of: to, range: sInd ..< endIndex)?.lowerBound) - .map { eInd in - substring(with: sInd ..< eInd) - } - } - } - - var encodeURIComponent: String? { - return self.addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed) - } var decodeJSONUri: String { return self.replacingOccurrences(of: "\\/", with: "/") } - - subscript (i: Int) -> Character { - get { - let index = characters.index(startIndex, offsetBy: i) - return self[index] - } - } - - func setCharAt(_ index: Int, character: Character) -> String { - if index > self.characters.count - 1 { - return self - } - - return self.subString(0, length: index) + String(character) + self.subString(index + 1, length: self.characters.count - index) - } - - func subString(_ startIndex: Int, length: Int) -> String { - let start = self.characters.index(self.startIndex, offsetBy: startIndex) - let end = self.characters.index(self.startIndex, offsetBy: startIndex+length, limitedBy: self.characters.index(self.startIndex, offsetBy: self.characters.count)) - - return self.substring(with: (start ..< end!)) - } - - func htmlDecoded() -> String { - guard (self != "") else { return self } - var newStr = self - let entities = [ - """ : "\"", - "&" : "&", - "'" : "'", - "<" : "<", - ">" : ">", - ] - - for (name,value) in entities { - newStr = newStr.replacingOccurrences(of: name, with: value) - } - return newStr - } } diff --git a/Podfile b/Podfile index 442398f..098d869 100644 --- a/Podfile +++ b/Podfile @@ -8,5 +8,6 @@ target 'NPO Live' do use_frameworks! # Pods for NPO Live - pod "NPOStream", :path => "../NPOStream/" +pod "NPOStream", "~> 0.0.6" + end diff --git a/Podfile.lock b/Podfile.lock index ad334ed..cb82756 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -2,15 +2,11 @@ PODS: - NPOStream (0.0.6) DEPENDENCIES: - - NPOStream (from `../NPOStream/`) - -EXTERNAL SOURCES: - NPOStream: - :path: ../NPOStream/ + - NPOStream (~> 0.0.6) SPEC CHECKSUMS: - NPOStream: 2421d98cf68c89d2e22413023f3ba45bc20f3331 + NPOStream: b22327c59cd8272e978cc961a4d343add4c80981 -PODFILE CHECKSUM: 6f5845b39f165f24029830281b2f97933a1714c0 +PODFILE CHECKSUM: e9d2ebf6f588c90d78d9f034ed311a29e4943ca2 COCOAPODS: 1.2.1 diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index ad334ed..cb82756 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -2,15 +2,11 @@ PODS: - NPOStream (0.0.6) DEPENDENCIES: - - NPOStream (from `../NPOStream/`) - -EXTERNAL SOURCES: - NPOStream: - :path: ../NPOStream/ + - NPOStream (~> 0.0.6) SPEC CHECKSUMS: - NPOStream: 2421d98cf68c89d2e22413023f3ba45bc20f3331 + NPOStream: b22327c59cd8272e978cc961a4d343add4c80981 -PODFILE CHECKSUM: 6f5845b39f165f24029830281b2f97933a1714c0 +PODFILE CHECKSUM: e9d2ebf6f588c90d78d9f034ed311a29e4943ca2 COCOAPODS: 1.2.1 diff --git a/Pods/NPOStream/LICENSE b/Pods/NPOStream/LICENSE new file mode 100644 index 0000000..ae2c147 --- /dev/null +++ b/Pods/NPOStream/LICENSE @@ -0,0 +1,7 @@ +Copyright (c) 2016 Bart den Hollander + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/Pods/NPOStream/NPOStream/Channel.swift b/Pods/NPOStream/NPOStream/Channel.swift new file mode 100644 index 0000000..f2399ff --- /dev/null +++ b/Pods/NPOStream/NPOStream/Channel.swift @@ -0,0 +1,21 @@ +// +// Channel.swift +// NPOStream +// +// Created by Bart den Hollander on 23/07/16. +// Copyright © 2016 Bart den Hollander. All rights reserved. +// + +import Foundation + +public class Channel { + public var title: String + public var streamTitle: ChannelStreamTitle + public var url: URL? + + public init(title: String, streamTitle: ChannelStreamTitle, url: URL?) { + self.title = title + self.streamTitle = streamTitle + self.url = url + } +} diff --git a/Pods/NPOStream/NPOStream/ChannelProvider.swift b/Pods/NPOStream/NPOStream/ChannelProvider.swift new file mode 100644 index 0000000..334acd1 --- /dev/null +++ b/Pods/NPOStream/NPOStream/ChannelProvider.swift @@ -0,0 +1,83 @@ +// +// ChannelProvider.swift +// NPOStream +// +// Created by Bart den Hollander on 23/07/16. +// Copyright © 2016 Bart den Hollander. All rights reserved. +// + +import Foundation + +public enum ChannelStreamTitle: String { + case NPO1 = "LI_NL1_4188102" + case NPO2 = "LI_NL2_4188105" + case NPO3 = "LI_NL3_4188107" + case NPONieuws = "LI_NEDERLAND1_221673" + case NPOPolitiek = "LI_NEDERLAND1_221675" + case NPO101 = "LI_NEDERLAND3_221683" + case NPOCultura = "LI_NEDERLAND2_221679" + case NPOZappXtra = "LI_NEDERLAND3_221687" + case NPORadio1 = "LI_RADIO1_300877" + case NPORadio2 = "LI_RADIO2_300879" + case NPO3FM = "LI_3FM_300881" + case NPORadio4 = "LI_RA4_698901" + case NPOFunX = "LI_3FM_603983" +} + +public struct ChannelProvider { + + public static let streams = [ + Channel( + title: "NPO 1", + streamTitle: ChannelStreamTitle.NPO1, + url: nil), + Channel( + title: "NPO 2", + streamTitle: ChannelStreamTitle.NPO2, + url: nil), + Channel( + title: "NPO 3", + streamTitle: ChannelStreamTitle.NPO3, + url: nil), + Channel( + title: "NPO Nieuws", + streamTitle: ChannelStreamTitle.NPONieuws, + url: nil), + Channel( + title: "NPO Politiek", + streamTitle: ChannelStreamTitle.NPOPolitiek, + url: nil), + Channel( + title: "NPO 101", + streamTitle: ChannelStreamTitle.NPO101, + url: nil), + Channel( + title: "NPO Cultura", + streamTitle: ChannelStreamTitle.NPOCultura, + url: nil), + Channel( + title: "NPO Zapp", + streamTitle: ChannelStreamTitle.NPOZappXtra, + url: nil), + Channel( + title: "NPO Radio 1", + streamTitle: ChannelStreamTitle.NPORadio1, + url: nil), + Channel( + title: "NPO Radio 2", + streamTitle: ChannelStreamTitle.NPORadio2, + url: nil), + Channel( + title: "NPO 3FM", + streamTitle: ChannelStreamTitle.NPO3FM, + url: nil), + Channel( + title: "NPO Radio 4", + streamTitle: ChannelStreamTitle.NPORadio4, + url: nil), + Channel( + title: "NPO FunX", + streamTitle: ChannelStreamTitle.NPOFunX, + url: nil) + ] +} diff --git a/Pods/NPOStream/NPOStream/Info.plist b/Pods/NPOStream/NPOStream/Info.plist new file mode 100644 index 0000000..fbe1e6b --- /dev/null +++ b/Pods/NPOStream/NPOStream/Info.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + + + diff --git a/Pods/NPOStream/NPOStream/NPOStream.h b/Pods/NPOStream/NPOStream/NPOStream.h new file mode 100644 index 0000000..d4de776 --- /dev/null +++ b/Pods/NPOStream/NPOStream/NPOStream.h @@ -0,0 +1,19 @@ +// +// NPOStream.h +// NPOStream +// +// Created by Bart den Hollander on 16/07/16. +// Copyright © 2016 Bart den Hollander. All rights reserved. +// + +#import + +//! Project version number for NPOStream. +FOUNDATION_EXPORT double NPOStreamVersionNumber; + +//! Project version string for NPOStream. +FOUNDATION_EXPORT const unsigned char NPOStreamVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + + diff --git a/Pods/NPOStream/NPOStream/NPOStream.swift b/Pods/NPOStream/NPOStream/NPOStream.swift new file mode 100644 index 0000000..4c2f0ad --- /dev/null +++ b/Pods/NPOStream/NPOStream/NPOStream.swift @@ -0,0 +1,63 @@ +// +// NPOStream.swift +// NPOStreamFramework +// +// Created by Bart den Hollander on 28-01-16. +// Copyright © 2016 Bart den Hollander. All rights reserved. +// + +import Foundation +import UIKit + +open class NPOStream { + + open static func getStream(_ channelTitle: ChannelStreamTitle, onCompletion: @escaping (Result) -> Void) { + + let API_URL = URL(string: "http://ida.omroep.nl/app.php/") + let TOKEN_URL = URL(string: "http://ida.omroep.nl/app.php/auth") + + DispatchQueue.global().async { + + guard + let API_URL = API_URL, + let TOKEN_URL = TOKEN_URL else { return onCompletion(.error(NPOStreamError.initialiseURLFailed)) } + let FirstURLtask = URLSession.shared.dataTask(with: TOKEN_URL) { (data, response, error) in + + guard + let data = data, + let response = String(data: data, encoding: String.Encoding.utf8), + let token:String = response.sliceFrom("token\":\"", to: "\""), + let secondURL = URL(string: API_URL.absoluteString + channelTitle.rawValue + "?adaptive=yes&token=" + token) else { + return onCompletion(.error(NPOStreamError.initialiseURLFailed)) + } + + let SecondURLtask = URLSession.shared.dataTask(with: secondURL) { (data, response, error) in + guard + let rawStreamURLData = data, + let rawStreamURLString = String.init(data: rawStreamURLData, encoding: String.Encoding.utf8), + let url:String = rawStreamURLString.sliceFrom("url\":\"", to: "\",\""), + let finalURL = URL(string: url.decodeJSONUri) else { + return onCompletion(.error(NPOStreamError.initialiseURLFailed)) + } + + let ThirdURLtask = URLSession.shared.dataTask(with: finalURL) { (data, response, error) in + guard + let finalStreamURL = data, + let response = String(data: finalStreamURL, encoding: String.Encoding.utf8), + let url = response.sliceFrom("setSource(\"", to: "\""), + let resultURL = URL(string: url.decodeJSONUri) else { + return onCompletion(.error(NPOStreamError.initialiseURLFailed)) + } + + DispatchQueue.main.async(execute: { + onCompletion(.success(resultURL)) + }) + } + ThirdURLtask.resume() + } + SecondURLtask.resume() + } + FirstURLtask.resume() + } + } +} diff --git a/Pods/NPOStream/NPOStream/NPOStreamError.swift b/Pods/NPOStream/NPOStream/NPOStreamError.swift new file mode 100644 index 0000000..cd7cf52 --- /dev/null +++ b/Pods/NPOStream/NPOStream/NPOStreamError.swift @@ -0,0 +1,13 @@ +// +// NPOStreamError.swift +// NPOStream +// +// Created by Bart den Hollander on 26/09/2017. +// Copyright © 2017 Bart den Hollander. All rights reserved. +// + +import Foundation + +public enum NPOStreamError: Error { + case initialiseURLFailed +} diff --git a/Pods/NPOStream/NPOStream/Result.swift b/Pods/NPOStream/NPOStream/Result.swift new file mode 100644 index 0000000..64faf4a --- /dev/null +++ b/Pods/NPOStream/NPOStream/Result.swift @@ -0,0 +1,25 @@ +// +// Result.swift +// NPOStream +// +// Created by Bart den Hollander on 26/09/2017. +// Copyright © 2017 Bart den Hollander. All rights reserved. +// + +import Foundation + +public enum Result { + case success(Element) + case error(Error) + + // Allow optional transforms (chaining). + public func map(_ transform: (Element) throws -> TransformedElement) rethrows -> Result { + switch self { + case .success(let val): + return Result.success(try transform(val)) + case .error(let error): + return Result.error(error) + } + } + +} diff --git a/Pods/NPOStream/NPOStream/String+Extension.swift b/Pods/NPOStream/NPOStream/String+Extension.swift new file mode 100755 index 0000000..9269d9c --- /dev/null +++ b/Pods/NPOStream/NPOStream/String+Extension.swift @@ -0,0 +1,43 @@ +// +// String+Extension.swift +// NPOStream +// +// Created by Bart den Hollander on 21-11-15. +// Copyright © 2016 Bart den Hollander. All rights reserved. +// + +import Foundation + +extension String { + + func sliceFrom(_ start: String, to: String) -> String? { + return (range(of: start)?.upperBound) + .flatMap { startIndex in + (range(of: to, range: startIndex.. String { + guard (self != "") else { return self } + var newStr = self + let entities = [ + """ : "\"", + "&" : "&", + "'" : "'", + "<" : "<", + ">" : ">", + ] + + for (name,value) in entities { + newStr = newStr.replacingOccurrences(of: name, with: value) + } + return newStr + } +} diff --git a/Pods/NPOStream/README.md b/Pods/NPOStream/README.md new file mode 100644 index 0000000..55e774e --- /dev/null +++ b/Pods/NPOStream/README.md @@ -0,0 +1,35 @@ +# NPOStream +Swift framework to get real-time streams of Dutch broadcasting studio (NPO). + +| Available NPO channels | +| ------------------------- | +| NPO1 | +| NPO2 | +| NPO3 | +| NPONieuws | +| NPOPolitiek | +| NPO101 | +| NPOCultura | +| NPOZappXtra | +| NPORadio1 | +| NPORadio2 | +| NPO3FM | +| NPORadio4 | + +# Usage +1. Import framework in Xcode project using Cocoapods ```pod "NPOStream"``` +2. Declare: ```import NPOStream``` on top of your swift file +3. Call the NPOStream.getStream function with a ChannelTitle enum case. ChannelTitle is a enum with all available NPO TV channels that NPOStream can provide. + +```NPOStream.getStream(ChannelTitle, onCompletion: (URL?, NSError?) -> Void)``` + + +# Example +``` +NPOStream.getStream(ChannelTitle.NPO3) { (url: URL?, error: NSError?) in + guard let streamURL = url, error == nil else { return } + self.performSegue(withIdentifier: "player", sender: streamURL) +} +``` + +Take a look at the Example project for more details.. diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index 7ce07c9..8a1df46 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -7,20 +7,20 @@ objects = { /* Begin PBXBuildFile section */ + 054E81A7622FCA78DB86CEB5D8668508 /* NPOStream-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 770BC37684DCF7BFCBD0FDEB139812DC /* NPOStream-dummy.m */; }; 058F9364DFC635F78BF0C7D1594C6B0E /* Pods-NPO Live-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 010D41F99D77EA189249A4B32BF1F06B /* Pods-NPO Live-dummy.m */; }; - 3BA1C83C53184FFDFBB7F0908C865681 /* NPOStreamError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BBECD05544CEDB1927F11261C43F970 /* NPOStreamError.swift */; }; - 49041014FC87DAD8DAF925942E7BA22B /* NPOStream-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = E75F5DE8CE434B79A12484DD3986865A /* NPOStream-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4FCCB4F62F86C0A52C19DED82D038726 /* Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = 9459DA9BB8E532AA27DFE5B6A558A43E /* Info.plist */; }; - 7714BBF07F9F752AB98FD682F93BB09B /* NPOStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 764949F6BFB9CC132D45D15074B528DD /* NPOStream.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 7C6A1F36224A566EF62D198C9B2D63C5 /* NPOStream-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4546100FA574E2A18C9C910240F03459 /* NPOStream-dummy.m */; }; - C5EBD426F1374666DF3DCCA93D4FB982 /* Channel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDFBBC64E08E498E0D9669CCA9C199F5 /* Channel.swift */; }; - CCF982F1255A67CA13E7486929812A41 /* ChannelProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4431C1DA56935E679899864F2AF48280 /* ChannelProvider.swift */; }; + 099985D50A97396B3A154D1E966EC2AD /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57DF77B6B4D332447B92D42944ECC8BF /* String+Extension.swift */; }; + 1FA6B7A2075FAD3BD6BF7C0DC71F02DC /* NPOStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = B246A65FEB59B2BA785C7BD22C0E59CF /* NPOStream.swift */; }; + 36E7285A7F0A358C2CBB246C79CD30BB /* ChannelProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74957A360B0FE060ACFE0ABEAFAE077C /* ChannelProvider.swift */; }; + 5EC04D6997B4EDF65A41B11734A0880C /* NPOStreamError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F83EFEBFEFA12975B265D5E70B4E027 /* NPOStreamError.swift */; }; + 772BEB85349E4BB7AB3D9724719CDE93 /* NPOStream-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 7FC2CFFF599523188C28057572D17DA1 /* NPOStream-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 8FE52A34FD25EED5ADD0CBAE4D32C01E /* Channel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EE7485DDF6D50940EED133A7B7B4822 /* Channel.swift */; }; + 925ABBE00079F385D6056AE48BC1D693 /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0FC5AF7784414C413769C4AD43A8E0E5 /* Result.swift */; }; + A3F45740773E42F8B34D22F45585D67D /* NPOStream.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C8A824A2FBB8FBDDAAF2039A40F01D /* NPOStream.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A983AB77056DFF54539ECA46330EC984 /* Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = 6A9B3E1C525B85F95B08E31856485930 /* Info.plist */; }; CEB69C43D71DDB142BCB13B9F262C6D1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17D63B397DD7C2A0B6C4DAADFD5B12F1 /* Foundation.framework */; }; E31DBA4EAC520A6BA0CD12012FF42093 /* Pods-NPO Live-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C7311374E368D23C2E281A173A9A59C /* Pods-NPO Live-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F4873C0F1D2804C431B0D3C272C31D08 /* NPOStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 542B3B353C0548F1141BCB079CC6AC33 /* NPOStream.swift */; }; - F6F1ABF0AE40B521F25461A52ED10D30 /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = E764A6C1146C5DFAFC3AFC731BA20AD2 /* Result.swift */; }; FB0D74AB85D8E06A076E820A7F767760 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17D63B397DD7C2A0B6C4DAADFD5B12F1 /* Foundation.framework */; }; - FFB250DC0E7C4A8DF776253F9A457A8A /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 801755AB6CE98DFA387BD12C5CF6ACDD /* String+Extension.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -36,31 +36,31 @@ /* Begin PBXFileReference section */ 010D41F99D77EA189249A4B32BF1F06B /* Pods-NPO Live-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-NPO Live-dummy.m"; sourceTree = ""; }; 09D919728AA602444061C933B2D76AA1 /* Pods-NPO Live-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-NPO Live-acknowledgements.markdown"; sourceTree = ""; }; + 0FC5AF7784414C413769C4AD43A8E0E5 /* Result.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Result.swift; path = NPOStream/Result.swift; sourceTree = ""; }; 17D63B397DD7C2A0B6C4DAADFD5B12F1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS10.2.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; - 2623DA6FD2E6B90930B27A5058C6D541 /* NPOStream.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = NPOStream.modulemap; sourceTree = ""; }; - 3ACE5DE36DCBDB6E63682F1B86BA70B7 /* NPOStream-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NPOStream-prefix.pch"; sourceTree = ""; }; 3C7311374E368D23C2E281A173A9A59C /* Pods-NPO Live-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-NPO Live-umbrella.h"; sourceTree = ""; }; - 4431C1DA56935E679899864F2AF48280 /* ChannelProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ChannelProvider.swift; sourceTree = ""; }; - 4546100FA574E2A18C9C910240F03459 /* NPOStream-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NPOStream-dummy.m"; sourceTree = ""; }; - 542B3B353C0548F1141BCB079CC6AC33 /* NPOStream.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NPOStream.swift; sourceTree = ""; }; + 3F83EFEBFEFA12975B265D5E70B4E027 /* NPOStreamError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NPOStreamError.swift; path = NPOStream/NPOStreamError.swift; sourceTree = ""; }; + 4EE7485DDF6D50940EED133A7B7B4822 /* Channel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Channel.swift; path = NPOStream/Channel.swift; sourceTree = ""; }; + 57DF77B6B4D332447B92D42944ECC8BF /* String+Extension.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "String+Extension.swift"; path = "NPOStream/String+Extension.swift"; sourceTree = ""; }; + 64393ECA494C01E982A75DEC77F53995 /* NPOStream-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NPOStream-prefix.pch"; sourceTree = ""; }; + 6A9B3E1C525B85F95B08E31856485930 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = Info.plist; path = NPOStream/Info.plist; sourceTree = ""; }; 728A159E6ED1BE63FB57F4B307AE94C7 /* Pods-NPO Live-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-NPO Live-resources.sh"; sourceTree = ""; }; - 764949F6BFB9CC132D45D15074B528DD /* NPOStream.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = NPOStream.h; sourceTree = ""; }; + 74957A360B0FE060ACFE0ABEAFAE077C /* ChannelProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ChannelProvider.swift; path = NPOStream/ChannelProvider.swift; sourceTree = ""; }; + 770BC37684DCF7BFCBD0FDEB139812DC /* NPOStream-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NPOStream-dummy.m"; sourceTree = ""; }; 7A23FDA22E2391439869F27094C82DCD /* Pods-NPO Live.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-NPO Live.debug.xcconfig"; sourceTree = ""; }; - 7BBECD05544CEDB1927F11261C43F970 /* NPOStreamError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NPOStreamError.swift; sourceTree = ""; }; - 7F2530BED96F26699408F73DE57C70C4 /* Pods-NPO Live.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-NPO Live.modulemap"; sourceTree = ""; }; - 801755AB6CE98DFA387BD12C5CF6ACDD /* String+Extension.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "String+Extension.swift"; sourceTree = ""; }; + 7F2530BED96F26699408F73DE57C70C4 /* Pods-NPO Live.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-NPO Live.modulemap"; sourceTree = ""; }; + 7FC2CFFF599523188C28057572D17DA1 /* NPOStream-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NPOStream-umbrella.h"; sourceTree = ""; }; 83E17AF88EBB3F5362DA22AE6E1239EE /* Pods-NPO Live.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-NPO Live.release.xcconfig"; sourceTree = ""; }; - 897FF767F5BCFA7BFA63FAA8BAFE01B7 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; - 9459DA9BB8E532AA27DFE5B6A558A43E /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 9FFCACDEF00B97EE44A134DA21F853A5 /* NPOStream.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = NPOStream.modulemap; sourceTree = ""; }; + AF4A70FD0C5AED6EF53D84B74661C2E4 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + B246A65FEB59B2BA785C7BD22C0E59CF /* NPOStream.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NPOStream.swift; path = NPOStream/NPOStream.swift; sourceTree = ""; }; B27A84FCC66FE9800BDC7916D28CD787 /* Pods-NPO Live-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-NPO Live-frameworks.sh"; sourceTree = ""; }; + B2C8A824A2FBB8FBDDAAF2039A40F01D /* NPOStream.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NPOStream.h; path = NPOStream/NPOStream.h; sourceTree = ""; }; + B8BC59BD9268C4CB30F0D4518A786D61 /* NPOStream.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = NPOStream.xcconfig; sourceTree = ""; }; CB2BE9D0A983E238B07537C940E0285A /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - CBBF675C7E08B9C5C72947A4B2CF1FCD /* NPOStream.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = NPOStream.xcconfig; sourceTree = ""; }; - CDFBBC64E08E498E0D9669CCA9C199F5 /* Channel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Channel.swift; sourceTree = ""; }; - CF7787279D92351210013B5A4C40B809 /* NPOStream.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = NPOStream.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - DBE56826BE65B9534D08E06132CFC3D8 /* Pods_NPO_Live.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NPO_Live.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - E75F5DE8CE434B79A12484DD3986865A /* NPOStream-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NPOStream-umbrella.h"; sourceTree = ""; }; - E764A6C1146C5DFAFC3AFC731BA20AD2 /* Result.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Result.swift; sourceTree = ""; }; + CF7787279D92351210013B5A4C40B809 /* NPOStream.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = NPOStream.framework; path = NPOStream.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + DBE56826BE65B9534D08E06132CFC3D8 /* Pods_NPO_Live.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_NPO_Live.framework; path = "Pods-NPO Live.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; F90BDB49C28508949E5576C495C8066D /* Pods-NPO Live-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-NPO Live-acknowledgements.plist"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -84,6 +84,14 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 137E04F86F5F1B969C50C810615FAE7F /* Pods */ = { + isa = PBXGroup; + children = ( + 65CDA560CAAD133E29813A3EE69B1BD8 /* NPOStream */, + ); + name = Pods; + sourceTree = ""; + }; 449507D5CAFFA8BB9EDF8F419AA7D51F /* Pods-NPO Live */ = { isa = PBXGroup; children = ( @@ -102,35 +110,48 @@ path = "Target Support Files/Pods-NPO Live"; sourceTree = ""; }; - 694CC5F9ACF7109581BF54BE46227FE2 /* Development Pods */ = { - isa = PBXGroup; - children = ( - 7B3959DE2E523522F39BF6386C691FAD /* NPOStream */, - ); - name = "Development Pods"; - sourceTree = ""; - }; - 7B3959DE2E523522F39BF6386C691FAD /* NPOStream */ = { + 65CDA560CAAD133E29813A3EE69B1BD8 /* NPOStream */ = { isa = PBXGroup; children = ( - FD258614853332E44E4FD728E1F1E1F9 /* NPOStream */, - E4278AE4B000436F59991FD6B16F4ADC /* Support Files */, + 4EE7485DDF6D50940EED133A7B7B4822 /* Channel.swift */, + 74957A360B0FE060ACFE0ABEAFAE077C /* ChannelProvider.swift */, + 6A9B3E1C525B85F95B08E31856485930 /* Info.plist */, + B2C8A824A2FBB8FBDDAAF2039A40F01D /* NPOStream.h */, + B246A65FEB59B2BA785C7BD22C0E59CF /* NPOStream.swift */, + 3F83EFEBFEFA12975B265D5E70B4E027 /* NPOStreamError.swift */, + 0FC5AF7784414C413769C4AD43A8E0E5 /* Result.swift */, + 57DF77B6B4D332447B92D42944ECC8BF /* String+Extension.swift */, + 86BD84B13F05E5FC9BB71BEE13224EAF /* Support Files */, ); name = NPOStream; - path = ../../NPOStream; + path = NPOStream; sourceTree = ""; }; 7DB346D0F39D3F0E887471402A8071AB = { isa = PBXGroup; children = ( 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */, - 694CC5F9ACF7109581BF54BE46227FE2 /* Development Pods */, BB99B8D4C7329D10E7E4451B0A72C15A /* Frameworks */, + 137E04F86F5F1B969C50C810615FAE7F /* Pods */, D3A8DD66B7E2B0F195A2444D85A38095 /* Products */, B1695790C5092CADA61EDFDB789BCEEB /* Targets Support Files */, ); sourceTree = ""; }; + 86BD84B13F05E5FC9BB71BEE13224EAF /* Support Files */ = { + isa = PBXGroup; + children = ( + AF4A70FD0C5AED6EF53D84B74661C2E4 /* Info.plist */, + 9FFCACDEF00B97EE44A134DA21F853A5 /* NPOStream.modulemap */, + B8BC59BD9268C4CB30F0D4518A786D61 /* NPOStream.xcconfig */, + 770BC37684DCF7BFCBD0FDEB139812DC /* NPOStream-dummy.m */, + 64393ECA494C01E982A75DEC77F53995 /* NPOStream-prefix.pch */, + 7FC2CFFF599523188C28057572D17DA1 /* NPOStream-umbrella.h */, + ); + name = "Support Files"; + path = "../Target Support Files/NPOStream"; + sourceTree = ""; + }; ACB6F43550E213F0570FA1E541F56EE8 /* tvOS */ = { isa = PBXGroup; children = ( @@ -164,52 +185,23 @@ name = Products; sourceTree = ""; }; - E4278AE4B000436F59991FD6B16F4ADC /* Support Files */ = { - isa = PBXGroup; - children = ( - 897FF767F5BCFA7BFA63FAA8BAFE01B7 /* Info.plist */, - 2623DA6FD2E6B90930B27A5058C6D541 /* NPOStream.modulemap */, - CBBF675C7E08B9C5C72947A4B2CF1FCD /* NPOStream.xcconfig */, - 4546100FA574E2A18C9C910240F03459 /* NPOStream-dummy.m */, - 3ACE5DE36DCBDB6E63682F1B86BA70B7 /* NPOStream-prefix.pch */, - E75F5DE8CE434B79A12484DD3986865A /* NPOStream-umbrella.h */, - ); - name = "Support Files"; - path = "../NPO-Live-Apple-TV-4-master/Pods/Target Support Files/NPOStream"; - sourceTree = ""; - }; - FD258614853332E44E4FD728E1F1E1F9 /* NPOStream */ = { - isa = PBXGroup; - children = ( - CDFBBC64E08E498E0D9669CCA9C199F5 /* Channel.swift */, - 4431C1DA56935E679899864F2AF48280 /* ChannelProvider.swift */, - 9459DA9BB8E532AA27DFE5B6A558A43E /* Info.plist */, - 764949F6BFB9CC132D45D15074B528DD /* NPOStream.h */, - 542B3B353C0548F1141BCB079CC6AC33 /* NPOStream.swift */, - 7BBECD05544CEDB1927F11261C43F970 /* NPOStreamError.swift */, - E764A6C1146C5DFAFC3AFC731BA20AD2 /* Result.swift */, - 801755AB6CE98DFA387BD12C5CF6ACDD /* String+Extension.swift */, - ); - path = NPOStream; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 3D4DE6B749E4BD282127CFE6A9AFA1D2 /* Headers */ = { + 6EA0EC3B4EA3D1919AE825CD0C251EB0 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 49041014FC87DAD8DAF925942E7BA22B /* NPOStream-umbrella.h in Headers */, - 7714BBF07F9F752AB98FD682F93BB09B /* NPOStream.h in Headers */, + E31DBA4EAC520A6BA0CD12012FF42093 /* Pods-NPO Live-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; - 6EA0EC3B4EA3D1919AE825CD0C251EB0 /* Headers */ = { + DFDF9F6B2B4E2BBE35A1009D270E23EF /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - E31DBA4EAC520A6BA0CD12012FF42093 /* Pods-NPO Live-umbrella.h in Headers */, + 772BEB85349E4BB7AB3D9724719CDE93 /* NPOStream-umbrella.h in Headers */, + A3F45740773E42F8B34D22F45585D67D /* NPOStream.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -238,9 +230,9 @@ isa = PBXNativeTarget; buildConfigurationList = CFC0BD26E0289525BA235348B2A477EC /* Build configuration list for PBXNativeTarget "NPOStream" */; buildPhases = ( - 9D7F4C288B88008A9C6E4AC8D0710035 /* Sources */, + 6145CCB1D753049758D1A63751BB48F2 /* Sources */, 4DB23567CA86F74695E16DB084660387 /* Frameworks */, - 3D4DE6B749E4BD282127CFE6A9AFA1D2 /* Headers */, + DFDF9F6B2B4E2BBE35A1009D270E23EF /* Headers */, ); buildRules = ( ); @@ -258,7 +250,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 0910; + LastUpgradeCheck = 0700; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; @@ -287,18 +279,18 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 9D7F4C288B88008A9C6E4AC8D0710035 /* Sources */ = { + 6145CCB1D753049758D1A63751BB48F2 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - C5EBD426F1374666DF3DCCA93D4FB982 /* Channel.swift in Sources */, - CCF982F1255A67CA13E7486929812A41 /* ChannelProvider.swift in Sources */, - 4FCCB4F62F86C0A52C19DED82D038726 /* Info.plist in Sources */, - 7C6A1F36224A566EF62D198C9B2D63C5 /* NPOStream-dummy.m in Sources */, - F4873C0F1D2804C431B0D3C272C31D08 /* NPOStream.swift in Sources */, - 3BA1C83C53184FFDFBB7F0908C865681 /* NPOStreamError.swift in Sources */, - F6F1ABF0AE40B521F25461A52ED10D30 /* Result.swift in Sources */, - FFB250DC0E7C4A8DF776253F9A457A8A /* String+Extension.swift in Sources */, + 8FE52A34FD25EED5ADD0CBAE4D32C01E /* Channel.swift in Sources */, + 36E7285A7F0A358C2CBB246C79CD30BB /* ChannelProvider.swift in Sources */, + A983AB77056DFF54539ECA46330EC984 /* Info.plist in Sources */, + 054E81A7622FCA78DB86CEB5D8668508 /* NPOStream-dummy.m in Sources */, + 1FA6B7A2075FAD3BD6BF7C0DC71F02DC /* NPOStream.swift in Sources */, + 5EC04D6997B4EDF65A41B11734A0880C /* NPOStreamError.swift in Sources */, + 925ABBE00079F385D6056AE48BC1D693 /* Result.swift in Sources */, + 099985D50A97396B3A154D1E966EC2AD /* String+Extension.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -362,9 +354,7 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; @@ -372,21 +362,15 @@ CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGNING_REQUIRED = NO; COPY_PHASE_STRIP = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "POD_CONFIGURATION_DEBUG=1", @@ -410,7 +394,7 @@ }; 779C0DAFF83F39414081A7779FD67066 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CBBF675C7E08B9C5C72947A4B2CF1FCD /* NPOStream.xcconfig */; + baseConfigurationReference = B8BC59BD9268C4CB30F0D4518A786D61 /* NPOStream.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -492,9 +476,7 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; @@ -502,20 +484,14 @@ CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGNING_REQUIRED = NO; COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "POD_CONFIGURATION_RELEASE=1", "$(inherited)", @@ -536,7 +512,7 @@ }; B958F1464680B3B4F8AD07F11114895E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CBBF675C7E08B9C5C72947A4B2CF1FCD /* NPOStream.xcconfig */; + baseConfigurationReference = B8BC59BD9268C4CB30F0D4518A786D61 /* NPOStream.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; diff --git a/Pods/Target Support Files/NPOStream/NPOStream.xcconfig b/Pods/Target Support Files/NPOStream/NPOStream.xcconfig index 69c3430..451b9a2 100644 --- a/Pods/Target Support Files/NPOStream/NPOStream.xcconfig +++ b/Pods/Target Support Files/NPOStream/NPOStream.xcconfig @@ -5,6 +5,6 @@ OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" PODS_BUILD_DIR = $BUILD_DIR PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} -PODS_TARGET_SRCROOT = ${PODS_ROOT}/../../NPOStream +PODS_TARGET_SRCROOT = ${PODS_ROOT}/NPOStream PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} SKIP_INSTALL = YES diff --git a/README.md b/README.md index 48ca284..157795f 100755 --- a/README.md +++ b/README.md @@ -2,15 +2,39 @@ NPO Live is an unofficial Apple TV application for watching NPO channels live, as we think using Airplay is not just ‘good enough’. [Source](http://www.iculture.nl/nederlandse-apple-tv-apps-omroepen-tv-aanbieders/) (Dutch) -Channels include NPO 1, NPO 2, NPO 3 and many more. +The app focuses on the best user experience and to make it as easy as possible to see what is currently broadcasted on all the different channels. And by offering this, you don't have to go from channel to channel to determine what's the most interesting to watch. + + +The following channels are available to watch. + +| Available NPO channels | +| ------------------------- | +| NPO1 | +| NPO2 | +| NPO3 | +| NPONieuws | +| NPOPolitiek | +| NPO101 | +| NPOCultura | +| NPOZappXtra | +| NPORadio1 | +| NPORadio2 | +| NPO3FM | +| NPORadio4 | ![Top Shelf](images/top_shelf.png) -![Channels](images/channels.png) ![Playing](images/playing.png) ## Changelog -v1.1: Design improvements, check for updates automatically, minor improvements -v1.0: Initial release. +* v1.0.1: Build fixed +* v1.0.0: Initial release + +## Next releases +- Check for updates automatically +- Active show per channel +- While watching a channel, go directly to the next or previous channel +- Subtitle support +- Automatic refresh token after one hour of watching a show (known issue) ## Setup As this is an unofficial app, not available on the App Store, you will need to _sideload_ it onto your Apple TV. To do so, you can follow the steps below. @@ -37,7 +61,7 @@ As this app is not publicly available on the App Store, you will have to manuall If you run into any problems with the app or have suggestions on how it can be inproved, please let us know. You can do so by [creating an issue](https://github.com/Mauricevb/NPO-Live-Apple-TV-4/issues). ### Authors -[@Maurice_vB](https://twitter.com/Maurice_vB) & [@BasThomas](https://twitter.com/BasThomas). +[@hollanderbart](https://twitter.com/hollanderbart) ### License MIT