Moving first methods over to N-API.

Author: sparkpunkd

.gitignore

@@ -28,3 +28,5 @@ node_modules
 
 # Gyp project - ignore build folder
 build
+
+.DS_Store

README.md

@@ -131,6 +131,6 @@ Contributions can be made via pull requests and will be considered by the author
 
 ## License
 
-This software is released under the Apache 2.0 license. Copyright 2017 Streampunk Media Ltd.
+This software is released under the Apache 2.0 license. Copyright 2018 Streampunk Media Ltd.
 
 The software links to the BlackMagic Desktop Video libraries. Include files and examples from which this code is derived include the BlackMagic License in their respective header files. The BlackMagic DeckLink SDK can be downloaded from https://www.blackmagicdesign.com/support.

binding.gyp

@@ -6,7 +6,7 @@
     ],
     "conditions": [
       ['OS=="mac"', {
-        'sources' : [ "src/macadam.cc", "src/Capture.cc", "src/Playback.cc" ],
+        'sources' : [ "src/macadam_util.cc", "src/macadam.cc" ],
         'xcode_settings': {
           'GCC_ENABLE_CPP_RTTI': 'YES',
           'MACOSX_DEPLOYMENT_TARGET': '10.7',
@@ -25,7 +25,7 @@
         ]
       }],
       ['OS=="linux"', {
-        'sources' : [ "src/macadam.cc", "src/Capture.cc", "src/Playback.cc" ],
+        'sources' : [ "src/macadam_util.cc", "src/macadam.cc" ],
         'link_settings' : {
           "libraries": [
             "/usr/lib/libDeckLinkAPI.so"
@@ -39,7 +39,7 @@
         ]
       }],
       ['OS=="win"', {
-        "sources" : [ "src/macadam.cc", "src/Capture.cc", "src/Playback.cc",
+        "sources" : [ "src/macadam_util.cc", "src/macadam.cc",
           "decklink/Win/include/DeckLinkAPI_i.c" ],
         "configurations": {
           "Release": {

index.js

@@ -1,4 +1,4 @@
-/* Copyright 2017 Streampunk Media Ltd.
+/* Copyright 2018 Streampunk Media Ltd.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -46,12 +46,11 @@ var isWinOrMac = (os.platform() === 'win32') || (os.platform() === 'darwin');
 // if (!isWinOrMac)
 //   throw('Macadam is not currently supported on this platform');
 
-var bindings = require('bindings');
-var macadamNative = bindings('macadam');
+const macadamNative = require('bindings')('macadam');
 const util = require('util');
 const EventEmitter = require('events');
 
-// var SegfaultHandler = require('../node-segfault-handler');
+// var SegfaultHandler = require('node-segfault-handler');
 // SegfaultHandler.registerHandler("crash.log");
 
 function Capture (deviceIndex, displayMode, pixelFormat) {

package.json

@@ -22,5 +22,8 @@
     "highland": "^2.11.1",
     "nan": "^2.6.2"
   },
+  "devDependencies": {
+    "segfault-handler": "^1.0.0"
+  },
   "gypfile": true
 }

scratch/convertEBU.js

@@ -1,4 +1,4 @@
-/* Copyright 2017 Streampunk Media Ltd.
+/* Copyright 2018 Streampunk Media Ltd.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

scratch/readEBU.js

@@ -1,4 +1,4 @@
-/* Copyright 2017 Streampunk Media Ltd.
+/* Copyright 2018 Streampunk Media Ltd.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

scratch/readEBU_safe.js

@@ -1,4 +1,4 @@
-/* Copyright 2017 Streampunk Media Ltd.
+/* Copyright 2018 Streampunk Media Ltd.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

scratch/record.js

@@ -1,4 +1,4 @@
-/* Copyright 2017 Streampunk Media Ltd.
+/* Copyright 2018 Streampunk Media Ltd.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

scratch/sigint_test.js

@@ -1,4 +1,4 @@
-/* Copyright 2017 Streampunk Media Ltd.
+/* Copyright 2018 Streampunk Media Ltd.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

src/Capture.cc

@@ -1,4 +1,4 @@
-/* Copyright 2017 Streampunk Media Ltd.
+/* Copyright 2018 Streampunk Media Ltd.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

src/Capture.h

@@ -1,4 +1,4 @@
-/* Copyright 2017 Streampunk Media Ltd.
+/* Copyright 2018 Streampunk Media Ltd.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

src/Playback.cc

@@ -1,4 +1,4 @@
-/* Copyright 2017 Streampunk Media Ltd.
+/* Copyright 2018 Streampunk Media Ltd.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

src/Playback.h

@@ -1,4 +1,4 @@
-/* Copyright 2017 Streampunk Media Ltd.
+/* Copyright 2018 Streampunk Media Ltd.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -42,11 +42,8 @@
 
 #define _WINSOCKAPI_
 
-#include <node.h>
-#include "node_buffer.h"
 #include "DeckLinkAPI.h"
 #include <stdio.h>
-#include <nan.h>
 
 #ifdef WIN32
 #include <tchar.h>
@@ -55,25 +52,24 @@
 #include <comdef.h>
 #endif
 
-#include "Capture.h"
-#include "Playback.h"
+#include "macadam_util.h"
 #include "node_api.h"
 
-using namespace v8;
+napi_value deckLinkVersion(napi_env env, napi_callback_info info) {
+  napi_status status;
+  napi_value result;
 
-NAN_METHOD(DeckLinkVersion) {
   IDeckLinkIterator* deckLinkIterator;
-  HRESULT	result;
+  HRESULT hresult;
   IDeckLinkAPIInformation*	deckLinkAPIInformation;
   #ifdef WIN32
   CoCreateInstance(CLSID_CDeckLinkIterator, NULL, CLSCTX_ALL, IID_IDeckLinkIterator, (void**)&deckLinkIterator);
   #else
   deckLinkIterator = CreateDeckLinkIteratorInstance();
   #endif
-  result = deckLinkIterator->QueryInterface(IID_IDeckLinkAPIInformation, (void**)&deckLinkAPIInformation);
-  if (result != S_OK) {
-    Nan::ThrowError("Error connecting to DeckLinkAPI.");
-  }
+
+  hresult = deckLinkIterator->QueryInterface(IID_IDeckLinkAPIInformation, (void**)&deckLinkAPIInformation);
+  if (hresult != S_OK) NAPI_THROW_ERROR("Error connecting to DeckLinkAPI.");
 
   char deckVer [80];
   int64_t	deckLinkVersion;
@@ -89,74 +85,76 @@ NAN_METHOD(DeckLinkVersion) {
   sprintf(deckVer, "DeckLinkAPI version: %d.%d.%d", dlVerMajor, dlVerMinor, dlVerPoint);
 
   deckLinkAPIInformation->Release();
+  deckLinkIterator->Release();
 
-  info.GetReturnValue().Set(Nan::New(deckVer).ToLocalChecked());
+  status = napi_create_string_utf8(env, deckVer, NAPI_AUTO_LENGTH, &result);
+  CHECK_STATUS;
+  return result;
 }
 
-NAN_METHOD(GetFirstDevice) {
+napi_value getFirstDevice(napi_env env, napi_callback_info info) {
+  napi_status status;
+  napi_value result;
+
+  status = napi_get_undefined(env, &result);
+  CHECK_STATUS;
+
   IDeckLinkIterator* deckLinkIterator;
-  HRESULT	result;
-  IDeckLinkAPIInformation *deckLinkAPIInformation;
+  HRESULT	hresult;
   IDeckLink* deckLink;
   #ifdef WIN32
   CoCreateInstance(CLSID_CDeckLinkIterator, NULL, CLSCTX_ALL, IID_IDeckLinkIterator, (void**)&deckLinkIterator);
   #else
   deckLinkIterator = CreateDeckLinkIteratorInstance();
   #endif
-  result = deckLinkIterator->QueryInterface(IID_IDeckLinkAPIInformation, (void**)&deckLinkAPIInformation);
-  if (result != S_OK) {
-    Nan::ThrowError("Error connecting to DeckLinkAPI.");
-  }
   if (deckLinkIterator->Next(&deckLink) != S_OK) {
-    info.GetReturnValue().SetUndefined();
-    return;
+    status = napi_get_undefined(env, &result);
+    CHECK_STATUS;
+    deckLinkIterator->Release();
+    return result;
   }
+
   #ifdef WIN32
   BSTR deviceNameBSTR = NULL;
-  result = deckLink->GetModelName(&deviceNameBSTR);
-  if (result == S_OK) {
+  hresult = deckLink->GetModelName(&deviceNameBSTR);
+  if (hresult == S_OK) {
     _bstr_t deviceName(deviceNameBSTR, false);
-    info.GetReturnValue().Set(Nan::New((char*) deviceName).ToLocalChecked());
-    return;
+    status = napi_create_string_utf8(env, (char*) deviceName, NAPI_AUTO_LENGTH, &result);
+    CHECK_STATUS;
   }
   #elif __APPLE__
   CFStringRef deviceNameCFString = NULL;
-  result = deckLink->GetModelName(&deviceNameCFString);
-  if (result == S_OK) {
+  hresult = deckLink->GetModelName(&deviceNameCFString);
+  if (hresult == S_OK) {
     char deviceName [64];
     CFStringGetCString(deviceNameCFString, deviceName, sizeof(deviceName), kCFStringEncodingMacRoman);
-    info.GetReturnValue().Set(Nan::New(deviceName).ToLocalChecked());
-    return;
+    status = napi_create_string_utf8(env, deviceName, NAPI_AUTO_LENGTH, &result);
+    CHECK_STATUS;
+  }
+  #else
+  const char* deviceName;
+  hresult = deckLink->GetModelName(&deviceName);
+  if (hresult == S_OK) {
+    status = napi_create_string_utf8(env, deviceName, NAPI_AUTO_LENGTH, &result);
+    CHECK_STATUS;
   }
   #endif
-  info.GetReturnValue().SetUndefined();
-}
-
 
+  deckLink->Release();
+  deckLinkIterator->Release();
 
-/* static Local<Object> makeBuffer(char* data, size_t size) {
-  HandleScope scope;
-
-  // It ends up being kind of a pain to convert a slow buffer into a fast
-  // one since the fast part is implemented in JavaScript.
-  Local<Buffer> slowBuffer = Buffer::New(data, size);
-  // First get the Buffer from global scope...
-  Local<Object> global = Context::GetCurrent()->Global();
-  Local<Value> bv = global->Get(String::NewSymbol("Buffer"));
-  assert(bv->IsFunction());
-  Local<Function> b = Local<Function>::Cast(bv);
-  // ...call Buffer() with the slow buffer and get a fast buffer back...
-  Handle<Value> argv[3] = { slowBuffer->handle_, Integer::New(size), Integer::New(0) };
-  Local<Object> fastBuffer = b->NewInstance(3, argv);
+  return result;
+}
 
-  return scope.Close(fastBuffer);
-} */
+napi_value Init(napi_env env, napi_value exports) {
+  napi_status status;
+  napi_property_descriptor desc[] = {
+    DECLARE_NAPI_METHOD("deckLinkVersion", deckLinkVersion),
+    DECLARE_NAPI_METHOD("getFirstDevice", getFirstDevice),
+   };
+  status = napi_define_properties(env, exports, 2, desc);
+  CHECK_STATUS;
 
-NAN_MODULE_INIT(Init) {
-  Nan::Export(target, "deckLinkVersion", DeckLinkVersion);
-  Nan::Export(target, "getFirstDevice", GetFirstDevice);
-  streampunk::Capture::Init(target);
-  streampunk::Playback::Init(target);
   #ifdef WIN32
   HRESULT result;
   result = CoInitialize(NULL);
@@ -165,6 +163,8 @@ NAN_MODULE_INIT(Init) {
 		fprintf(stderr, "Initialization of COM failed - result = %08x.\n", result);
 	}
   #endif
+
+  return exports;
 }
 
-NODE_MODULE(macadam, Init);
+NAPI_MODULE(nodencl, Init)