@@ -45,36 +45,38 @@ protocol LibraryWrapperType {
4545}
4646
4747enum LibraryWrapper : LibraryWrapperType {
48+ private static let lock = NSLock ( )
49+
4850 static var libraryLogger : ( Int , String ) -> Void = { _, message in
4951 print ( " [swift-ass] \( message) " )
5052 }
5153
5254 static func libraryInit( ) -> OpaquePointer ? {
53- withLock {
55+ withLock ( lock ) {
5456 ass_library_init ( )
5557 }
5658 }
5759
5860 static func libraryDone( _ library: OpaquePointer ) {
59- withLock {
61+ withLock ( lock ) {
6062 ass_library_done ( library)
6163 }
6264 }
6365
6466 static func rendererInit( _ library: OpaquePointer ) -> OpaquePointer ? {
65- withLock {
67+ withLock ( lock ) {
6668 ass_renderer_init ( library)
6769 }
6870 }
6971
7072 static func rendererDone( _ renderer: OpaquePointer ) {
71- withLock {
73+ withLock ( lock ) {
7274 ass_renderer_done ( renderer)
7375 }
7476 }
7577
7678 static func setLogCallback( _ library: OpaquePointer ) {
77- withLock {
79+ withLock ( lock ) {
7880 ass_set_message_cb ( library, { messageLevel, messageString, messageArgs, _ in
7981 guard let messageString else { return }
8082 let message = String ( cString: messageString)
@@ -89,13 +91,13 @@ enum LibraryWrapper: LibraryWrapperType {
8991 }
9092
9193 static func setRendererSize( _ renderer: OpaquePointer , size: CGSize ) {
92- withLock {
94+ withLock ( lock ) {
9395 ass_set_frame_size ( renderer, Int32 ( size. width) , Int32 ( size. height) )
9496 }
9597 }
9698
9799 static func setExtractFonts( _ library: OpaquePointer , extract: Bool ) {
98- withLock {
100+ withLock ( lock ) {
99101 ass_set_extract_fonts ( library, extract ? 1 : 0 )
100102 }
101103 }
@@ -107,7 +109,7 @@ enum LibraryWrapper: LibraryWrapperType {
107109 defaultFont: String ? = nil ,
108110 defaultFamily: String ? = nil
109111 ) {
110- withLock {
112+ withLock ( lock ) {
111113 let defaultFont = defaultFont. flatMap { $0. cString ( using: . utf8) }
112114 let defaultFamily = defaultFamily. flatMap { $0. cString ( using: . utf8) }
113115 let fontConfig = configPath. flatMap { $0. cString ( using: . utf8) }
@@ -117,7 +119,7 @@ enum LibraryWrapper: LibraryWrapperType {
117119 }
118120
119121 static func readTrack( _ library: OpaquePointer , content: String ) -> ASS_Track ? {
120- withLock {
122+ withLock ( lock ) {
121123 guard var buffer = content. cString ( using: . utf8) else { return nil }
122124 return ass_read_memory ( library, & buffer, buffer. count, nil ) . pointee
123125 }
@@ -128,22 +130,12 @@ enum LibraryWrapper: LibraryWrapperType {
128130 track: inout ASS_Track ,
129131 at offset: TimeInterval
130132 ) -> LibraryRenderResult ? {
131- withLock {
133+ withLock ( lock ) {
132134 var changed : Int32 = 0
133135 let millisecond = Int64 ( offset * 1000 )
134136 guard let frame = ass_render_frame ( renderer, & track, millisecond, & changed) else { return nil }
135137
136138 return LibraryRenderResult ( image: frame. pointee, changed: changed != 0 )
137139 }
138140 }
139-
140- // MARK: - Private
141-
142- private static let lock = NSLock ( )
143-
144- private static func withLock< T> ( _ perform: ( ) -> T ) -> T {
145- lock. lock ( )
146- defer { lock. unlock ( ) }
147- return perform ( )
148- }
149141}
0 commit comments