noobs 0.0.178 → 0.0.180

package/index.d.ts

@@ -158,6 +158,11 @@ export type SourceDimensions = {
   width: number; // Width in pixels, before scaling
 };
 
+export enum FileExtension {
+  MP4,
+  MKV,
+}
+
 interface Noobs {
   Init(
     distPath: string,
@@ -174,7 +179,7 @@ interface Noobs {
   StopRecording(): void;
   ForceStopRecording(): void;
   GetLastRecording(): string;
-  SetRecordingDir(recordingPath: string): void;
+  SetRecordingCfg(recordingPath: string, fileExtension: FileExtension): void;
   ResetVideoContext(fps: number, width: number, height: number): void;
 
   // Encoder functions.

package/index.js

@@ -1,9 +1,21 @@
 const path = require('path');
 
-process.env.Path = path
+// Path to the OBS binaries. We want this to come first so that the correct
+// DLLs are loaded. It's possible other copies are on the system PATH already.
+let binPath = path
   .resolve(__dirname, 'dist', 'bin')
   .replace('app.asar', 'app.asar.unpacked');
 
+if (process.env.PATH) {
+  // Almost certainly there is an existing PATH. We don't want to drop
+  // things off the path as it might make other things fail.
+  binPath += ';';
+  binPath += process.env.PATH;
+}
+
+// Now set the updated PATH for this process.
+process.env.Path = binPath;
+
 const packageName = 'noobs.node';
 const noobs = require(`./dist/${packageName}`);
-module.exports = noobs;
+module.exports = noobs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "noobs",
-  "version": "0.0.178",
+  "version": "0.0.180",
   "description": "A native Node.js addon with libobs bindings for Warcraft Recorder.",
   "main": "index.js",
   "types": "index.d.ts",

package/src/main.cpp

@@ -37,22 +37,34 @@ Napi::Value ObsShutdown(const Napi::CallbackInfo& info) {
   return info.Env().Undefined();
 }
 
-Napi::Value ObsSetRecordingDir(const Napi::CallbackInfo& info) {
+Napi::Value ObsSetRecordingCfg(const Napi::CallbackInfo& info) {
   if (!obs) {
-    blog(LOG_ERROR, "ObsSetRecordingDir called but obs is not initialized");
+    blog(LOG_ERROR, "ObsSetRecordingCfg called but obs is not initialized");
     Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
     return info.Env().Undefined();
   }
 
-  bool valid = info.Length() == 1 && info[0].IsString();
+  bool valid = info.Length() == 2 && info[0].IsString() && info[1].IsNumber();
 
   if (!valid) {
-    Napi::TypeError::New(info.Env(), "Invalid arguments passed to ObsSetRecordingDir").ThrowAsJavaScriptException();
+    Napi::TypeError::New(info.Env(), "Invalid arguments passed to ObsSetRecordingCfg").ThrowAsJavaScriptException();
     return info.Env().Undefined();
   }
 
   std::string recordingPath = info[0].As<Napi::String>().Utf8Value();
-  obs->setRecordingDir(recordingPath);
+  int fileExt = info[1].As<Napi::Number>().Int32Value();
+  std::string fileExtension;
+  
+  if (fileExt == 0) {
+    fileExtension = "mp4";
+  } else if (fileExt == 1) {
+    fileExtension = "mkv";
+  } else {
+    Napi::TypeError::New(info.Env(), "Invalid file extension value").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
+  }
+  
+  obs->setRecordingCfg(recordingPath, fileExtension);
   return info.Env().Undefined();
 }
 
@@ -665,7 +677,7 @@ Napi::Value ObsGetDrawSourceOutlineEnabled(const Napi::CallbackInfo& info) {
 Napi::Object Init(Napi::Env env, Napi::Object exports) {
   exports.Set("Init", Napi::Function::New(env, ObsInit));
   exports.Set("Shutdown", Napi::Function::New(env, ObsShutdown));
-  exports.Set("SetRecordingDir", Napi::Function::New(env, ObsSetRecordingDir));
+  exports.Set("SetRecordingCfg", Napi::Function::New(env, ObsSetRecordingCfg));
   exports.Set("ResetVideoContext", Napi::Function::New(env, ObsResetVideoContext));
   exports.Set("ListVideoEncoders", Napi::Function::New(env, ObsListVideoEncoders));
   exports.Set("SetVideoEncoder", Napi::Function::New(env, ObsSetVideoEncoder));

package/src/obs_interface.cpp

@@ -262,11 +262,11 @@ void ObsInterface::create_output() {
     obs_data_set_int(settings, "max_size_mb", 1024);
     obs_data_set_string(settings, "directory", recording_path.c_str());
     obs_data_set_string(settings, "format", "%CCYY-%MM-%DD %hh-%mm-%ss");
-    obs_data_set_string(settings, "extension", "mp4");
+    obs_data_set_string(settings, "extension", file_extension.c_str());
   } else {
     blog(LOG_INFO, "Set ffmpeg_muxer settings");
     // Need to specify the exact path for ffmpeg_muxer. We will write this again at start recording.
-    std::string filename = recording_path + "\\" + get_current_date_time() + ".mp4";
+    std::string filename = recording_path + "\\" + get_current_date_time() + "." + file_extension;
     obs_data_set_string(settings, "path", filename.c_str());
     unbuffered_output_filename = filename;
   }
@@ -276,8 +276,14 @@ void ObsInterface::create_output() {
   connect_signal_handlers(output);
 }
 
-void ObsInterface::setRecordingDir(const std::string& recordingPath) {
-  blog(LOG_INFO, "Set recording directory. Path: %s", recordingPath.c_str());
+void ObsInterface::setRecordingCfg(
+  const std::string& recordingPath, 
+  const std::string& fileExtension
+) {
+  blog(LOG_INFO, "Set recording config. Path: %s. Ext %s", 
+    recordingPath.c_str(), 
+    fileExtension.c_str()
+  );
 
   if (obs_output_active(output)) {
     blog(LOG_ERROR, "Output is active, cannot update recording path");
@@ -285,12 +291,14 @@ void ObsInterface::setRecordingDir(const std::string& recordingPath) {
   }
 
   recording_path = recordingPath;
+  file_extension = fileExtension;
   create_output();
 
   create_video_encoders();
   create_audio_encoders();
 }
 
+
 void ObsInterface::create_video_encoders() {
   blog(LOG_INFO, "Set video encoder: %s", video_encoder_id.c_str());
 
@@ -1099,7 +1107,7 @@ void ObsInterface::startRecording(int offset) {
     }
   } else {
     obs_data_t *ffmpeg_settings = obs_data_create();
-    std::string filename = recording_path + "\\" + get_current_date_time() + ".mp4";
+    std::string filename = recording_path + "\\" + get_current_date_time() + "." + file_extension;
     obs_data_set_string(ffmpeg_settings,  "path", filename.c_str());
     obs_output_update(output, ffmpeg_settings);
     obs_data_release(ffmpeg_settings);

package/src/obs_interface.h

@@ -52,7 +52,7 @@ class ObsInterface {
     void forceStopRecording(); // Force stop the recording, this will not save the current recording.
     std::string getLastRecording(); // Get the last recorded file path.
     void setBuffering(bool buffer); // Enable or disable buffering.
-    void setRecordingDir(const std::string& recordingPath); // Set the recording path.
+    void setRecordingCfg(const std::string& recordingPath, const std::string& fileExtension); // Set the recording path.
     void setVideoContext(int fps, int width, int height); // Reset video settings.
 
     std::string createSource(std::string name, std::string type); // Create a new source, returns the name of the source which can vary from the requested.
@@ -105,6 +105,7 @@ class ObsInterface {
     Napi::ThreadSafeFunction jscb; // javascript callback
     std::string recording_path = ""; 
     std::string unbuffered_output_filename = "";
+    std::string file_extension = "mp4"; // File extension for recordings.
 
     bool buffering = false; // Whether we are buffering the recording in memory.
     bool drawSourceOutline = false; // Draw red outline around source