Rename the displayId option to screenId

And make it a number instead of a string.

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.travis.yml

@@ -1,5 +1,5 @@
 os: osx
-osx_image: xcode9.3
+osx_image: xcode9.4
 language: node_js
 node_js:
   - 'node'

index.js

@@ -36,7 +36,7 @@ class Aperture {
     cropArea = undefined,
     showCursor = true,
     highlightClicks = false,
-    displayId = 'main',
+    screenId = 0,
     audioDeviceId = undefined,
     videoCodec = undefined
   } = {}) {
@@ -67,7 +67,7 @@ class Aperture {
         fps,
         showCursor,
         highlightClicks,
-        displayId,
+        screenId,
         audioDeviceId
       };
 

readme.md

@@ -128,12 +128,12 @@ Highlight cursor clicks in the screen recording.
 
 Enabling this will also enable the `showCursor` option.
 
-##### displayId
+##### screenId
 
-Type: `string`<br>
-Default: `main`
+Type: `number`<br>
+Default: `aperture.screens()[0]` *(Primary screen)*
 
-Display to record.
+Screen to record.
 
 ##### audioDeviceId
 

swift/aperture/Recorder.swift

@@ -27,11 +27,20 @@ final class Recorder: NSObject {
   }
 
   /// TODO: When targeting macOS 10.13, make the `videoCodec` option the type `AVVideoCodecType`
-  init(destination: URL, fps: Int, cropRect: CGRect?, showCursor: Bool, highlightClicks: Bool, displayId: CGDirectDisplayID = .main, audioDevice: AVCaptureDevice? = .default(for: .audio), videoCodec: String? = nil) throws {
+  init(
+    destination: URL,
+    fps: Int,
+    cropRect: CGRect?,
+    showCursor: Bool,
+    highlightClicks: Bool,
+    screenId: CGDirectDisplayID = .main,
+    audioDevice: AVCaptureDevice? = .default(for: .audio),
+    videoCodec: String? = nil
+  ) throws {
     self.destination = destination
     session = AVCaptureSession()
 
-    let input = AVCaptureScreenInput(displayID: displayId)
+    let input = AVCaptureScreenInput(displayID: screenId)
 
     /// TODO: Use `CMTime(seconds:)` here instead
     input.minFrameDuration = CMTime(value: 1, timescale: Int32(fps))

swift/aperture/main.swift

@@ -16,7 +16,7 @@ struct Options: Decodable {
   let cropRect: CGRect?
   let showCursor: Bool
   let highlightClicks: Bool
-  let displayId: String
+  let screenId: CGDirectDisplayID
   let audioDeviceId: String?
   let videoCodec: String?
 }
@@ -31,7 +31,7 @@ func record() throws {
     cropRect: options.cropRect,
     showCursor: options.showCursor,
     highlightClicks: options.highlightClicks,
-    displayId: options.displayId == "main" ? CGMainDisplayID() : CGDirectDisplayID(options.displayId)!,
+    screenId: options.screenId == 0 ? .main : options.screenId,
     audioDevice: options.audioDeviceId != nil ? AVCaptureDevice(uniqueID: options.audioDeviceId!) : nil,
     videoCodec: options.videoCodec
   )