noobs 0.0.115 → 0.0.131

package/index.d.ts

@@ -136,7 +136,7 @@ export type ObsProperty =
   | ObsGenericProperty;
 
 export type Signal = {
-  type: string; // Either "output" or "volmeter".
+  type: string; // Either "output" or "volmeter" or "source".
   id: string; // Signal identifier, e.g. "stop"
   code: number; // 0 for success, other values for errors
   value?: number; // Currently only used for volmeters.
@@ -158,7 +158,6 @@ interface Noobs {
   Init(
     distPath: string,
     logPath: string,
-    recordingPath: string,
     cb: (signal: Signal) => void,
   ): void;
 
@@ -179,7 +178,7 @@ interface Noobs {
   SetVideoEncoder(id: string, settings: ObsData): void; // Create the video encoder to use.
 
   // Source management functions.
-  CreateSource(name: string, type: string): void;
+  CreateSource(name: string, type: string): string; // Returns the name of the source, which may vary in the event of a name conflict.
   DeleteSource(name: string): void;
   GetSourceSettings(name: string): ObsData;
   SetSourceSettings(name: string, settings: ObsData): void;
@@ -187,18 +186,16 @@ interface Noobs {
 
   // Audio source management functions.
   SetMuteAudioInputs(mute: boolean): void; // Mute or unmute all audio inputs.
-  SetInputVolume(volume: number): void; // Set the volume for all audio inputs sources.
-  SetOutputVolume(volume: number): void; // Set the volume for all audio outputs sources.
-  SetProcessVolume(volume: number): void; // Set the volume for all audio process sources.
-
+  SetSourceVolume(name: string, volume: number): void; // Set the volume for a specific audio source (0.0 to 1.0).
   SetVolmeterEnabled(enabled: boolean): void; // Enable or disable the volume meter.
+  SetAudioSuppression(enabled: boolean): void; // Enable or disable audio suppression (noise gate).
+  SetForceMono(enabled: boolean): void; // Enable or disable the force mono audio setting.
 
   // Scene management functions.
   AddSourceToScene(sourceName: string): void;
   RemoveSourceFromScene(sourceName: string): void;
   GetSourcePos(name: string): SceneItemPosition & SourceDimensions;
   SetSourcePos(name: string, pos: SceneItemPosition): void;
-  // TODO: Cropping?
 
   // Preview functions.
   InitPreview(hwnd: Buffer): void;

package/package.json

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

package/src/main.cpp

@@ -7,11 +7,10 @@
 ObsInterface* obs = nullptr;
 
 Napi::Value ObsInit(const Napi::CallbackInfo& info) {
-  bool valid = info.Length() == 4 &&
+  bool valid = info.Length() == 3 &&
    info[0].IsString() &&   // Dist path
    info[1].IsString() &&   // Log path
-   info[2].IsString() &&   // Recording path
-   info[3].IsFunction();   // JavaScript callback
+   info[2].IsFunction();   // JavaScript callback
 
   if (!valid) {
     Napi::Error::New(info.Env(), "Invalid arguments passed to ObsInit").ThrowAsJavaScriptException();
@@ -20,13 +19,12 @@ Napi::Value ObsInit(const Napi::CallbackInfo& info) {
 
   std::string distPath = info[0].As<Napi::String>().Utf8Value();
   std::string logPath = info[1].As<Napi::String>().Utf8Value();
-  std::string recordingPath = info[2].As<Napi::String>().Utf8Value();
-  Napi::Function fn = info[3].As<Napi::Function>();
+  Napi::Function fn = info[2].As<Napi::Function>();
 
   Napi::ThreadSafeFunction jscb =
     Napi::ThreadSafeFunction::New(info.Env(), fn, "JavaScript callback", 0, 1);
 
-  obs = new ObsInterface(distPath, logPath, recordingPath, jscb);
+  obs = new ObsInterface(distPath, logPath, jscb);
   return info.Env().Undefined();
 }
 
@@ -118,7 +116,6 @@ Napi::Value ObsSetVideoEncoder(const Napi::CallbackInfo& info) {
 
   obs_data_t* settings = napi_to_data(obj);
   obs->setVideoEncoder(id, settings);
-  obs_data_release(settings);
 
   return info.Env().Undefined();
 }
@@ -139,12 +136,7 @@ Napi::Value ObsSetBuffering(const Napi::CallbackInfo& info) {
   }
 
   bool buffering = info[0].As<Napi::Boolean>().Value();
-  bool success = obs->setBuffering(buffering);
-
-  if (!success) {
-    Napi::Error::New(info.Env(), "Failed to set buffering mode, is recording active?").ThrowAsJavaScriptException();
-    return info.Env().Undefined();
-  }
+  obs->setBuffering(buffering);
 
   return info.Env().Undefined();
 }
@@ -329,8 +321,8 @@ Napi::Value ObsCreateSource(const Napi::CallbackInfo& info) {
   std::string name = info[0].As<Napi::String>().Utf8Value();
   std::string type = info[1].As<Napi::String>().Utf8Value();
 
-  obs->createSource(name, type);
-  return info.Env().Undefined();
+  std::string real_name = obs->createSource(name, type);
+  return Napi::String::New(info.Env(), real_name);
 }
 
 Napi::Value ObsDeleteSource(const Napi::CallbackInfo& info) {
@@ -436,98 +428,77 @@ Napi::Value ObsSetMuteAudioInputs(const Napi::CallbackInfo& info) {
   return info.Env().Undefined();
 }
 
-Napi::Value ObsSetOutputVolume(const Napi::CallbackInfo& info) {
+Napi::Value ObsSetSourceVolume(const Napi::CallbackInfo& info) {
   if (!obs) {
-    blog(LOG_ERROR, "ObsSetOutputVolume called but obs is not initialized");
+    blog(LOG_ERROR, "ObsSetSourceVolume called but obs is not initialized");
     throw std::runtime_error("Obs not initialized");
   }
 
-  bool valid = info.Length() == 1 && info[0].IsNumber();
-  float volume = info[0].As<Napi::Number>().FloatValue();
+  bool valid = info.Length() == 2 && info[0].IsString() && info[1].IsNumber();
+  std::string name = info[0].As<Napi::String>().Utf8Value();
+  float volume = info[1].As<Napi::Number>().FloatValue();
 
   if (!valid || (volume < 0.0f || volume > 1.0f)) {
     Napi::TypeError::New(info.Env(), "Invalid arguments passed to ObsSetOutputVolume").ThrowAsJavaScriptException();
     return info.Env().Undefined();  
   }
 
-  obs->setOutputVolume(volume);
+  obs->setSourceVolume(name,volume);
   return info.Env().Undefined();
 }
 
-Napi::Value ObsSetInputVolume(const Napi::CallbackInfo& info) {
+Napi::Value ObsSetVolmeterEnabled(const Napi::CallbackInfo& info) {
   if (!obs) {
-    blog(LOG_ERROR, "ObsSetInputVolume called but obs is not initialized");
+    blog(LOG_ERROR, "ObsSetVolmeterEnabled called but obs is not initialized");
     throw std::runtime_error("Obs not initialized");
   }
 
-  bool valid = info.Length() == 1 && info[0].IsNumber();
-  float volume = info[0].As<Napi::Number>().FloatValue();
-
-  if (!valid || (volume < 0.0f || volume > 1.0f)) {
-    Napi::TypeError::New(info.Env(), "Invalid arguments passed to ObsSetInputVolume").ThrowAsJavaScriptException();
-    return info.Env().Undefined();  
-  }
-  
-  obs->setInputVolume(volume);
-  return info.Env().Undefined();
-}
-
-Napi::Value ObsSetProcessVolume(const Napi::CallbackInfo& info) {
-  if (!obs) {
-    blog(LOG_ERROR, "ObsSetProcessVolume called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
-  }
+  bool valid = info.Length() == 1 && info[0].IsBoolean();
 
-  bool valid = info.Length() == 1 && info[0].IsNumber();
-  float volume = info[0].As<Napi::Number>().FloatValue();
 
-  if (!valid || (volume < 0.0f || volume > 1.0f)) {
-    Napi::TypeError::New(info.Env(), "Invalid arguments passed to ObsSetProcessVolume").ThrowAsJavaScriptException();
+  if (!valid) {
+    Napi::TypeError::New(info.Env(), "Invalid arguments passed to ObsSetVolmeterEnabled").ThrowAsJavaScriptException();
     return info.Env().Undefined();  
   }
 
-  obs->setProcessVolume(volume);
+  bool enabled = info[0].As<Napi::Boolean>().Value();
+  obs->setVolmeterEnabled(enabled);
   return info.Env().Undefined();
 }
 
-Napi::Value ObsSetVolmeterEnabled(const Napi::CallbackInfo& info) {
+Napi::Value ObsSetAudioSuppression(const Napi::CallbackInfo& info) {
   if (!obs) {
-    blog(LOG_ERROR, "ObsSetVolmeterEnabled called but obs is not initialized");
+    blog(LOG_ERROR, "ObsSetAudioSuppression called but obs is not initialized");
     throw std::runtime_error("Obs not initialized");
   }
 
   bool valid = info.Length() == 1 && info[0].IsBoolean();
 
-
   if (!valid) {
-    Napi::TypeError::New(info.Env(), "Invalid arguments passed to ObsSetVolmeterEnabled").ThrowAsJavaScriptException();
-    return info.Env().Undefined();  
+    Napi::TypeError::New(info.Env(), "Invalid arguments passed to ObsSetAudioSuppression").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   bool enabled = info[0].As<Napi::Boolean>().Value();
-  obs->setVolmeterEnabled(enabled);
+  obs->setAudioSuppression(enabled);
   return info.Env().Undefined();
 }
 
-Napi::Value ObsCreateScene(const Napi::CallbackInfo& info) {
+Napi::Value ObsSetForceMono(const Napi::CallbackInfo& info) {
   if (!obs) {
-    blog(LOG_ERROR, "ObsCreateScene called but obs is not initialized");
+    blog(LOG_ERROR, "ObsSetForceMono called but obs is not initialized");
     throw std::runtime_error("Obs not initialized");
   }
 
-  bool valid = info.Length() == 2 &&
-   info[0].IsString() && // Scene name
-   info[1].IsString();   // Source type
+  bool valid = info.Length() == 1 && info[0].IsBoolean();
 
   if (!valid) {
-    Napi::TypeError::New(info.Env(), "Invalid arguments passed to ObsCreateScene").ThrowAsJavaScriptException();
+    Napi::TypeError::New(info.Env(), "Invalid arguments passed to ObsSetForceMono").ThrowAsJavaScriptException();
     return info.Env().Undefined();
   }
 
-  std::string name = info[0].As<Napi::String>().Utf8Value();
-  std::string type = info[1].As<Napi::String>().Utf8Value();
-
-  obs->createSource(name, type);
+  bool enabled = info[0].As<Napi::Boolean>().Value();
+  obs->setForceMono(enabled);
   return info.Env().Undefined();
 }
 
@@ -664,12 +635,10 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) {
   exports.Set("SetSourceSettings", Napi::Function::New(env, ObsSetSourceSettings));
   exports.Set("GetSourceProperties", Napi::Function::New(env, ObsGetSourceProperties));
   exports.Set("SetMuteAudioInputs", Napi::Function::New(env, ObsSetMuteAudioInputs));
-
-  exports.Set("SetOutputVolume", Napi::Function::New(env, ObsSetOutputVolume));
-  exports.Set("SetInputVolume", Napi::Function::New(env, ObsSetInputVolume));
-  exports.Set("SetProcessVolume", Napi::Function::New(env, ObsSetProcessVolume));
-
+  exports.Set("SetSourceVolume", Napi::Function::New(env, ObsSetSourceVolume));
   exports.Set("SetVolmeterEnabled", Napi::Function::New(env, ObsSetVolmeterEnabled));
+  exports.Set("SetAudioSuppression", Napi::Function::New(env, ObsSetAudioSuppression));
+  exports.Set("SetForceMono", Napi::Function::New(env, ObsSetForceMono));
 
   exports.Set("AddSourceToScene", Napi::Function::New(env, ObsAddSourceToScene));
   exports.Set("RemoveSourceFromScene", Napi::Function::New(env, ObsRemoveSourceFromScene));