dnrops
/
HaishinKit.swift
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove NSObject Inheritance

This commit is contained in:
shogo4405 2019-09-22 17:02:56 +09:00
parent 412e48c314
commit 07af449b87
25 changed files with 113 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Package.swift
View File

@ -6,7 +6,7 @@ let package = Package(
name: "HaishinKit",
products: [
.library(name: "RTMP", targets: ["HTTP"]),
.library(name: "HTTP", targets: ["RTMP"]),
.library(name: "HTTP", targets: ["RTMP"])
],
dependencies: [
.Package(url: "https://github.com/shogo4405/Logboard.git", from: "2.2.3")

2
Sources/Extension/Mirror+Extension.swift
View File

@ -1,7 +1,7 @@
import Foundation
extension Mirror {
var description: String {
var debugDescription: String {
var data: [String] = []
if let superclassMirror: Mirror = superclassMirror {

6
Sources/FLV/FLVTagType.swift
View File

@ -25,7 +25,7 @@ public enum FLVTagType: UInt8 {
}
// MARK: -
public protocol FLVTag: CustomStringConvertible {
public protocol FLVTag: CustomDebugStringConvertible {
var tagType: FLVTagType { get set }
var dataSize: UInt32 { get set }
var timestamp: UInt32 { get set }
@ -57,8 +57,8 @@ extension FLVTag {
}
}
// MARK: CustomStringConvertible
public var description: String {
// MARK: CustomDebugStringConvertible
public var debugDescription: String {
return Mirror(reflecting: self).description
}
}

6
Sources/HTTP/HTTPResponse.swift
View File

@ -1,6 +1,6 @@
import Foundation
protocol HTTPResponseCompatible: CustomStringConvertible {
protocol HTTPResponseCompatible: CustomDebugStringConvertible {
var version: String { get set }
var statusCode: String { get set }
var headerFields: [String: String] { get set }
@ -8,8 +8,8 @@ protocol HTTPResponseCompatible: CustomStringConvertible {
}
extension HTTPResponseCompatible {
// MARK: CustomStringConvertible
public var description: String {
// MARK: CustomDebugStringConvertible
public var debugDescription: String {
return Mirror(reflecting: self).description
}
}

6
Sources/ISO/AudioSpecificConfig.swift
View File

@ -75,9 +75,9 @@ struct AudioSpecificConfig {
}
}
extension AudioSpecificConfig: CustomStringConvertible {
// MARK: CustomStringConvertible
var description: String {
extension AudioSpecificConfig: CustomDebugStringConvertible {
// MARK: CustomDebugStringConvertible
var debugDescription: String {
return Mirror(reflecting: self).description
}
}

6
Sources/ISO/H264+AVC.swift
View File

@ -151,9 +151,9 @@ extension AVCConfigurationRecord: DataConvertible {
}
}
extension AVCConfigurationRecord: CustomStringConvertible {
// MARK: CustomStringConvertible
var description: String {
extension AVCConfigurationRecord: CustomDebugStringConvertible {
// MARK: CustomDebugStringConvertible
var debugDescription: String {
return Mirror(reflecting: self).description
}
}

24
Sources/ISO/MP4Reader.swift
View File

@ -79,9 +79,9 @@ class MP4Box {
}
}
extension MP4Box: CustomStringConvertible {
// MARK: CustomStringConvertible
var description: String {
extension MP4Box: CustomDebugStringConvertible {
// MARK: CustomDebugStringConvertible
var debugDescription: String {
return Mirror(reflecting: self).description
}
}
@ -195,11 +195,11 @@ final class MP4SyncSampleBox: MP4Box {
// MARK: -
final class MP4TimeToSampleBox: MP4Box {
struct Entry: CustomStringConvertible {
struct Entry: CustomDebugStringConvertible {
var sampleCount: UInt32 = 0
var sampleDuration: UInt32 = 0
var description: String {
var debugDescription: String {
return Mirror(reflecting: self).description
}
@ -431,12 +431,12 @@ final class MP4SampleDescriptionBox: MP4ContainerBox {
// MARK: -
final class MP4SampleToChunkBox: MP4Box {
struct Entry: CustomStringConvertible {
struct Entry: CustomDebugStringConvertible {
var firstChunk: UInt32 = 0
var samplesPerChunk: UInt32 = 0
var sampleDescriptionIndex: UInt32 = 0
var description: String {
var debugDescription: String {
return Mirror(reflecting: self).description
}
@ -469,12 +469,12 @@ final class MP4SampleToChunkBox: MP4Box {
// MARK: -
final class MP4EditListBox: MP4Box {
struct Entry: CustomStringConvertible {
struct Entry: CustomDebugStringConvertible {
var segmentDuration: UInt32 = 0
var mediaTime: UInt32 = 0
var mediaRate: UInt32 = 0
var description: String {
var debugDescription: String {
return Mirror(reflecting: self).description
}
@ -715,9 +715,9 @@ extension MP4TrakReader: TimerDriverDelegate {
}
}
extension MP4TrakReader: CustomStringConvertible {
// MARK: CustomStringConvertible
var description: String {
extension MP4TrakReader: CustomDebugStringConvertible {
// MARK: CustomDebugStringConvertible
var debugDescription: String {
return Mirror(reflecting: self).description
}
}

12
Sources/ISO/PacketizedElementaryStream.swift
View File

@ -118,9 +118,9 @@ extension PESOptionalHeader: DataConvertible {
}
}
extension PESOptionalHeader: CustomStringConvertible {
// MARK: CustomStringConvertible
var description: String {
extension PESOptionalHeader: CustomDebugStringConvertible {
// MARK: CustomDebugStringConvertible
var debugDescription: String {
return Mirror(reflecting: self).description
}
}
@ -300,9 +300,9 @@ struct PacketizedElementaryStream: PESPacketHeader {
}
}
extension PacketizedElementaryStream: CustomStringConvertible {
// MARK: CustomStringConvertible
var description: String {
extension PacketizedElementaryStream: CustomDebugStringConvertible {
// MARK: CustomDebugStringConvertible
var debugDescription: String {
return Mirror(reflecting: self).description
}
}

12
Sources/ISO/ProgramSpecific.swift
View File

@ -126,9 +126,9 @@ extension ProgramSpecific: DataConvertible {
}
}
extension ProgramSpecific: CustomStringConvertible {
// MARK: CustomStringConvertible
var description: String {
extension ProgramSpecific: CustomDebugStringConvertible {
// MARK: CustomDebugStringConvertible
var debugDescription: String {
return Mirror(reflecting: self).description
}
}
@ -274,9 +274,9 @@ extension ElementaryStreamSpecificData: DataConvertible {
}
}
extension ElementaryStreamSpecificData: CustomStringConvertible {
// MARK: CustomStringConvertible
var description: String {
extension ElementaryStreamSpecificData: CustomDebugStringConvertible {
// MARK: CustomDebugStringConvertible
var debugDescription: String {
return Mirror(reflecting: self).description
}
}

6
Sources/ISO/TSReader.swift
View File

@ -88,9 +88,9 @@ extension TSReader: IteratorProtocol {
}
}
extension TSReader: CustomStringConvertible {
// MARK: CustomStringConvertible
var description: String {
extension TSReader: CustomDebugStringConvertible {
// MARK: CustomDebugStringConvertible
var debugDescription: String {
return Mirror(reflecting: self).description
}
}

18
Sources/ISO/TransportStream.swift
View File

@ -179,9 +179,9 @@ struct TSProgramClockReference {
}
}
extension TSPacket: CustomStringConvertible {
// MARK: CustomStringConvertible
var description: String {
extension TSPacket: CustomDebugStringConvertible {
// MARK: CustomDebugStringConvertible
var debugDescription: String {
return Mirror(reflecting: self).description
}
}
@ -305,9 +305,9 @@ extension TSAdaptationField: DataConvertible {
}
}
extension TSAdaptationField: CustomStringConvertible {
// MARK: CustomStringConvertible
var description: String {
extension TSAdaptationField: CustomDebugStringConvertible {
// MARK: CustomDebugStringConvertible
var debugDescription: String {
return Mirror(reflecting: self).description
}
}
@ -381,9 +381,9 @@ extension TSAdaptationExtensionField: DataConvertible {
}
}
extension TSAdaptationExtensionField: CustomStringConvertible {
// MARK: CustomStringConvertible
var description: String {
extension TSAdaptationExtensionField: CustomDebugStringConvertible {
// MARK: CustomDebugStringConvertible
var debugDescription: String {
return Mirror(reflecting: self).description
}
}

6
Sources/Media/SoundTransform.swift
View File

@ -17,9 +17,9 @@ public struct SoundTransform {
}
}
extension SoundTransform: CustomStringConvertible {
// MARK: CustomStringConvertible
public var description: String {
extension SoundTransform: CustomDebugStringConvertible {
// MARK: CustomDebugStringConvertible
public var debugDescription: String {
return Mirror(reflecting: self).description
}
}

4
Sources/RTMP/AMF0Serializer.swift
View File

@ -1,6 +1,6 @@
import Foundation
class AMFSerializerUtil {
final class AMFSerializerUtil {
private static var classes: [String: AnyClass] = [: ]
static func getClassByAlias(_ name: String) -> AnyClass? {
@ -73,7 +73,7 @@ protocol AMFSerializer: ByteArrayConvertible {
-seealso: http://wwwimages.adobe.com/content/dam/Adobe/en/devnet/amf/pdf/amf0-file-format-specification.pdf
*/
class AMF0Serializer: ByteArray {
final class AMF0Serializer: ByteArray {
enum `Type`: UInt8 {
case number = 0x00
case bool = 0x01

4
Sources/RTMP/AMF3Serializer.swift
View File

@ -1,6 +1,6 @@
import Foundation
class AMFReference {
final class AMFReference {
var strings: [String] = []
var objects: [Any] = []
@ -63,7 +63,7 @@ class AMFReference {
- seealso: http://wwwimages.adobe.com/www.adobe.com/content/dam/Adobe/en/devnet/amf/pdf/amf-file-format-spec.pdf
*/
class AMF3Serializer: ByteArray {
final class AMF3Serializer: ByteArray {
enum `Type`: UInt8 {
case undefined = 0x00
case null = 0x01

8
Sources/RTMP/ASClass.swift
View File

@ -31,7 +31,7 @@ public struct ASTypedObject {
decoders[name] = decoder
}
public static func register<T:Decodable>(type: T.Type, named name: String) {
public static func register<T: Decodable>(type: T.Type, named name: String) {
decoders[name] = {
let jsonData = try JSONSerialization.data(withJSONObject: $1, options: [])
return try JSONDecoder().decode(type, from: jsonData)
@ -101,9 +101,9 @@ extension ASArray: ExpressibleByArrayLiteral {
}
}
extension ASArray: CustomStringConvertible {
// MARK: CustomStringConvertible
public var description: String {
extension ASArray: CustomDebugStringConvertible {
// MARK: CustomDebugStringConvertible
public var debugDescription: String {
return data.description
}
}

6
Sources/RTMP/RTMPChunk.swift
View File

@ -271,9 +271,9 @@ final class RTMPChunk {
}
}
extension RTMPChunk: CustomStringConvertible {
// MARK: CustomStringConvertible
var description: String {
extension RTMPChunk: CustomDebugStringConvertible {
// MARK: CustomDebugStringConvertible
var debugDescription: String {
return Mirror(reflecting: self).description
}
}

7
Sources/RTMP/RTMPConnection.swift
View File

@ -4,7 +4,7 @@ import Foundation
/**
flash.net.Responder for Swift
*/
open class Responder: NSObject {
open class Responder {
public typealias Handler = (_ data: [Any?]) -> Void
private var result: Handler
@ -254,11 +254,6 @@ open class RTMPConnection: EventDispatcher {
removeEventListener(Event.RTMP_STATUS, selector: #selector(on(status:)))
}
@available(*, unavailable)
open func connect(_ command: String) {
connect(command, arguments: nil)
}
open func call(_ commandName: String, responder: Responder?, arguments: Any?...) {
guard connected else {
return

6
Sources/RTMP/RTMPMessage.swift
View File

@ -68,9 +68,9 @@ class RTMPMessage {
}
}
extension RTMPMessage: CustomStringConvertible {
// MARK: CustomStringConvertible
var description: String {
extension RTMPMessage: CustomDebugStringConvertible {
// MARK: CustomDebugStringConvertible
var debugDescription: String {
return Mirror(reflecting: self).description
}
}

19
Sources/RTMP/RTMPSharedObject.swift
View File

@ -70,9 +70,9 @@ struct RTMPSharedObjectEvent {
}
}
extension RTMPSharedObjectEvent: CustomStringConvertible {
// MARK: CustomStringConvertible
var description: String {
extension RTMPSharedObjectEvent: CustomDebugStringConvertible {
// MARK: CustomDebugStringConvertible
var debugDescription: String {
return Mirror(reflecting: self).description
}
}
@ -114,10 +114,6 @@ open class RTMPSharedObject: EventDispatcher {
}
}
override open var description: String {
return data.description
}
private var rtmpConnection: RTMPConnection?
init(name: String, path: String, persistence: Bool) {
@ -218,7 +214,7 @@ open class RTMPSharedObject: EventDispatcher {
}
@objc
func rtmpStatusHandler(_ notification: Notification) {
private func rtmpStatusHandler(_ notification: Notification) {
let e = Event.from(notification)
if let data: ASObject = e.data as? ASObject, let code: String = data["code"] as? String {
switch code {
@ -231,3 +227,10 @@ open class RTMPSharedObject: EventDispatcher {
}
}
}
extension RTMPSharedObject: CustomDebugStringConvertible {
// MARK: CustomDebugStringConvertible
public var debugDescription: String {
return data.debugDescription
}
}

14
Sources/RTMP/RTMPStream.swift
View File

@ -22,9 +22,9 @@ public struct RTMPStreamInfo {
}
}
extension RTMPStreamInfo: CustomStringConvertible {
// MARK: CustomStringConvertible
public var description: String {
extension RTMPStreamInfo: CustomDebugStringConvertible {
// MARK: CustomDebugStringConvertible
public var debugDescription: String {
return Mirror(reflecting: self).description
}
}
@ -183,7 +183,7 @@ open class RTMPStream: NetStream {
case `switch`
}
public struct PlayOption: CustomStringConvertible {
public struct PlayOption: CustomDebugStringConvertible {
public var len: Double = 0
public var offset: Double = 0
public var oldStreamName: String = ""
@ -191,7 +191,7 @@ open class RTMPStream: NetStream {
public var streamName: String = ""
public var transition: PlayTransition = .switch
public var description: String {
public var debugDescription: String {
return Mirror(reflecting: self).description
}
}
@ -669,10 +669,10 @@ extension RTMPStream: AVMixerDelegate {
// MARK: AVMixerDelegate
func didOutputVideo(_ buffer: CMSampleBuffer) {
frameCount += 1
delegate?.didOutputVideo?(buffer)
delegate?.didOutputVideo(buffer)
}
func didOutputAudio(_ buffer: AVAudioPCMBuffer, presentationTimeStamp: CMTime) {
delegate?.didOutputAudio?(buffer, presentationTimeStamp: presentationTimeStamp)
delegate?.didOutputAudio(buffer, presentationTimeStamp: presentationTimeStamp)
}
}

17
Sources/RTMP/RTMPStreamDelegate.swift
View File

@ -1,16 +1,17 @@
import AVFoundation
import CoreMedia
@objc
public protocol RTMPStreamDelegate: class {
func didPublishInsufficientBW(_ stream: RTMPStream, withConnection: RTMPConnection)
func didPublishSufficientBW(_ stream: RTMPStream, withConnection: RTMPConnection)
@objc
optional func didOutputAudio(_ buffer: AVAudioPCMBuffer, presentationTimeStamp: CMTime)
@objc
optional func didOutputVideo(_ buffer: CMSampleBuffer)
func didOutputAudio(_ buffer: AVAudioPCMBuffer, presentationTimeStamp: CMTime)
func didOutputVideo(_ buffer: CMSampleBuffer)
func clear()
}
extension RTMPStreamDelegate {
func didOutputAudio(_ buffer: AVAudioPCMBuffer, presentationTimeStamp: CMTime) {
}
func didOutputVideo(_ buffer: CMSampleBuffer) {
}
}

6
Sources/Util/ByteArray.swift
View File

@ -318,9 +318,9 @@ open class ByteArray: ByteArrayConvertible {
}
}
extension ByteArray: CustomStringConvertible {
// MARK: CustomStringConvertible
public var description: String {
extension ByteArray: CustomDebugStringConvertible {
// MARK: CustomDebugStringConvertible
public var debugDescription: String {
return Mirror(reflecting: self).description
}
}

6
Sources/Util/CRC32.swift
View File

@ -30,9 +30,9 @@ final class CRC32 {
}
}
extension CRC32: CustomStringConvertible {
// MARK: CustomStringConvertible
var description: String {
extension CRC32: CustomDebugStringConvertible {
// MARK: CustomDebugStringConvertible
var debugDescription: String {
return Mirror(reflecting: self).description
}
}

18
Sources/Util/EventDispatcher.swift
View File

@ -21,7 +21,7 @@ public enum EventPhase: UInt8 {
/**
flash.events.Event for Swift
*/
open class Event: NSObject {
open class Event {
public static let SYNC: String = "sync"
public static let EVENT: String = "event"
public static let IO_ERROR: String = "ioError"
@ -41,10 +41,6 @@ open class Event: NSObject {
open fileprivate(set) var data: Any?
open fileprivate(set) var target: AnyObject?
override open var description: String {
return Mirror(reflecting: self).description
}
public init(type: String, bubbles: Bool = false, data: Any? = nil) {
self.type = type
self.bubbles = bubbles
@ -52,15 +48,21 @@ open class Event: NSObject {
}
}
extension Event: CustomDebugStringConvertible {
// MARK: CustomDebugStringConvertible
public var debugDescription: String {
return Mirror(reflecting: self).description
}
}
// MARK: -
/**
flash.events.EventDispatcher for Swift
*/
open class EventDispatcher: NSObject, IEventDispatcher {
open class EventDispatcher: IEventDispatcher {
private weak var target: AnyObject?
override public init() {
super.init()
public init() {
}
public init(target: AnyObject) {

8
Sources/Util/TimerDriver.swift
View File

@ -5,7 +5,7 @@ public protocol TimerDriverDelegate: class {
}
// MARK: -
public class TimerDriver: NSObject {
public class TimerDriver {
public var interval: UInt64 = MachUtil.nanosToAbs(10 * MachUtil.nanosPerMsec)
var queue: DispatchQueue?
@ -22,17 +22,13 @@ public class TimerDriver: NSObject {
}
}
override public var description: String {
return Mirror(reflecting: self).description
}
public func setDelegate(_ delegate: TimerDriverDelegate, withQueue: DispatchQueue? = nil) {
self.delegate = delegate
self.queue = withQueue
}
@objc
func on(timer: Timer) {
private func on(timer: Timer) {
guard nextFire <= mach_absolute_time() else {
return
}