Adopted the standard withCString for C strings throughout the library.

Sources/PlaydateKit/Graphics/Classes/Bitmap.swift

@@ -26,7 +26,7 @@ extension Graphics {
         /// Loads a bitmap from a file in the game's pdx or Data directory.
         public convenience init(path: String) throws(PlaydateError) {
             var error: UnsafePointer<CChar>?
-            let pointer = path.withPlaydateCString { gfx.pointee.loadBitmap.unsafelyUnwrapped($0, &error) }
+            let pointer = path.withCString { gfx.pointee.loadBitmap.unsafelyUnwrapped($0, &error) }
             guard let pointer else { throw PlaydateError(cString: error) }
             self.init(pointer: pointer, isOwned: true)
         }
@@ -77,7 +77,7 @@ extension Graphics {
         /// Replaces the bitmap's contents with the image at `path`.
         public func load(path: String) throws(PlaydateError) {
             var error: UnsafePointer<CChar>?
-            path.withPlaydateCString { gfx.pointee.loadIntoBitmap.unsafelyUnwrapped($0, pointer, &error) }
+            path.withCString { gfx.pointee.loadIntoBitmap.unsafelyUnwrapped($0, pointer, &error) }
             cachedSize = nil
             if let error { throw PlaydateError(cString: error) }
         }

Sources/PlaydateKit/Graphics/Classes/BitmapTable.swift

@@ -18,7 +18,7 @@ extension Graphics {
         /// Loads an image table from a file.
         public convenience init(path: String) throws(PlaydateError) {
             var error: UnsafePointer<CChar>?
-            let pointer = path.withPlaydateCString { gfx.pointee.loadBitmapTable.unsafelyUnwrapped($0, &error) }
+            let pointer = path.withCString { gfx.pointee.loadBitmapTable.unsafelyUnwrapped($0, &error) }
             guard let pointer else { throw PlaydateError(cString: error) }
             self.init(pointer: pointer)
         }
@@ -30,7 +30,7 @@ extension Graphics {
         /// Replaces the table's contents with the image table at `path`.
         public func load(path: String) throws(PlaydateError) {
             var error: UnsafePointer<CChar>?
-            path.withPlaydateCString { gfx.pointee.loadIntoBitmapTable.unsafelyUnwrapped($0, pointer, &error) }
+            path.withCString { gfx.pointee.loadIntoBitmapTable.unsafelyUnwrapped($0, pointer, &error) }
             if let error { throw PlaydateError(cString: error) }
         }
 

Sources/PlaydateKit/Graphics/Classes/Font.swift

@@ -16,7 +16,7 @@ extension Graphics {
         /// Loads a font from a file.
         public convenience init(path: String) throws(PlaydateError) {
             var error: UnsafePointer<CChar>?
-            let pointer = path.withPlaydateCString { gfx.pointee.loadFont.unsafelyUnwrapped($0, &error) }
+            let pointer = path.withCString { gfx.pointee.loadFont.unsafelyUnwrapped($0, &error) }
             guard let pointer else { throw PlaydateError(cString: error) }
             self.init(pointer: pointer)
         }
@@ -48,8 +48,8 @@ extension Graphics {
 
         /// The width of `text` when drawn with this font.
         public func textWidth(_ text: String, tracking: Int = 0) -> Int {
-            text.withPlaydateUTF8 { bytes, count in
-                Int(gfx.pointee.getTextWidth.unsafelyUnwrapped(pointer, bytes, count,
+            text.withCString { cString in
+                Int(gfx.pointee.getTextWidth.unsafelyUnwrapped(pointer, cString, text.utf8.count,
                                                                kUTF8Encoding, Int32(tracking)))
             }
         }
@@ -57,9 +57,9 @@ extension Graphics {
         /// The height of `text` when wrapped to `maxWidth` with this font.
         public func textHeight(_ text: String, maxWidth: Int, wrap: TextWrappingMode = .word,
                                tracking: Int = 0, extraLeading: Int = 0) -> Int {
-            text.withPlaydateUTF8 { bytes, count in
+            text.withCString { cString in
                 Int(gfx.pointee.getTextHeightForMaxWidth.unsafelyUnwrapped(
-                    pointer, bytes, count, Int32(maxWidth), kUTF8Encoding,
+                    pointer, cString, text.utf8.count, Int32(maxWidth), kUTF8Encoding,
                     wrap.cValue, Int32(tracking), Int32(extraLeading)))
             }
         }

Sources/PlaydateKit/Graphics/Classes/VideoPlayer.swift

@@ -18,7 +18,7 @@ extension Graphics {
 
         /// Opens the .pdv file at `path`.
         public convenience init(path: String) throws(PlaydateError) {
-            let pointer = path.withPlaydateCString { videoAPI.pointee.loadVideo.unsafelyUnwrapped($0) }
+            let pointer = path.withCString { videoAPI.pointee.loadVideo.unsafelyUnwrapped($0) }
             guard let pointer else {
                 throw PlaydateError(message: "unable to load video: \(path)")
             }