noobs 0.0.190 → 0.0.200

package/package.json

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

package/src/obs_interface.cpp

@@ -23,6 +23,10 @@ void call_jscb(Napi::Env env, Napi::Function cb, SignalData* sd) {
     obj.Set("error", Napi::String::New(env, sd->error.value()));
   }
 
+  if (sd->path.has_value()) {
+    obj.Set("path", Napi::String::New(env, sd->path.value()));
+  }
+
   cb.Call({ obj });
   delete sd;
 }
@@ -597,25 +601,40 @@ obs_properties_t* ObsInterface::getSourceProperties(std::string name) {
 }
 
 void ObsInterface::output_signal_handler(void *data, calldata_t *cd) {
-  long long code = calldata_int(cd, "code");
-  const char *err = calldata_string(cd, "last_error");
+  SignalContext* ctx = static_cast<SignalContext*>(data);
+  ObsInterface* self = ctx->self;
+  SignalData* sd;
 
-  std::optional<std::string> error;
+  blog(LOG_INFO, "Handling %s signal from libobs", ctx->id.c_str());
 
-  if (err) {
-    error = std::string(err);
-  }
+  if (ctx->id == "converted") {
+    const char *path = calldata_string(cd, "file");
 
-  SignalContext* ctx = static_cast<SignalContext*>(data);
-  ObsInterface* self = ctx->self;
+    sd = new SignalData{ 
+      "output", 
+      "converted", 
+      0, // Never actually get a code for a converted signal, so just set it to 0.
+      std::nullopt, // No value, that's only used for volmeters.
+      std::nullopt, // Never expect errors here.
+      std::string(path),
+    };
+  } else {
+    long long code = calldata_int(cd, "code");
+    const char *err = calldata_string(cd, "last_error");
+    std::optional<std::string> error;
 
-  SignalData* sd = new SignalData{ 
-    "output", 
-    ctx->id.c_str(), 
-    code, 
-    std::nullopt, // No value, that's only used for volmeters.
-    error,
-  };
+    if (err) {
+      error = std::string(err);
+    }
+
+    sd = new SignalData{ 
+      "output", 
+      ctx->id.c_str(), 
+      code, 
+      std::nullopt, // No value, that's only used for volmeters.
+      error,
+    };
+  }
 
   self->jscb.NonBlockingCall(sd, call_jscb);
 }
@@ -628,6 +647,7 @@ void ObsInterface::connect_signal_handlers(obs_output_t *output) {
   signal_handler_connect(sh, "stop", output_signal_handler,  stop_ctx);
   signal_handler_connect(sh, "activate", output_signal_handler, activate_ctx);
   signal_handler_connect(sh, "deactivate", output_signal_handler, deactivate_ctx);
+  signal_handler_connect(sh, "converted", output_signal_handler, converted_ctx);
 }
 
 void ObsInterface::disconnect_signal_handlers(obs_output_t *output) {
@@ -637,7 +657,8 @@ void ObsInterface::disconnect_signal_handlers(obs_output_t *output) {
   signal_handler_disconnect(sh, "stopping", output_signal_handler,  stopping_ctx);
   signal_handler_disconnect(sh, "stop", output_signal_handler,  stop_ctx);
   signal_handler_disconnect(sh, "activate", output_signal_handler, activate_ctx);
-  signal_handler_disconnect(sh, "deactivate ", output_signal_handler, deactivate_ctx);
+  signal_handler_disconnect(sh, "deactivate", output_signal_handler, deactivate_ctx);
+  signal_handler_disconnect(sh, "converted ", output_signal_handler, converted_ctx);
 }
 
 bool draw_source_outline(obs_scene_t *scene, obs_sceneitem_t *item, void *p) {
@@ -955,6 +976,7 @@ ObsInterface::ObsInterface(
   stop_ctx = new SignalContext{ this, "stop" };
   activate_ctx = new SignalContext{this, "activate"};
   deactivate_ctx = new SignalContext{this, "deactivate"};
+  converted_ctx = new SignalContext{this, "converted"};
 
   // Create the resources we rely on.
   create_scene();
@@ -987,6 +1009,7 @@ ObsInterface::~ObsInterface() {
   delete stop_ctx;
   delete activate_ctx;
   delete deactivate_ctx;
+  delete converted_ctx;
 
   for (auto& kv : sources) {
     std::string name = kv.first;

package/src/obs_interface.h

@@ -19,6 +19,7 @@ struct SignalData {
   long long code;
   std::optional<float> value;
   std::optional<std::string> error;
+  std::optional<std::string> path; // used by converted signal handler
 };
 
 struct SignalContext {
@@ -124,6 +125,7 @@ class ObsInterface {
     SignalContext* stop_ctx;
     SignalContext* activate_ctx;
     SignalContext* deactivate_ctx;
+    SignalContext* converted_ctx;
     static void output_signal_handler(void *data, calldata_t *cd);
 
     void list_encoders(obs_encoder_type type = OBS_ENCODER_VIDEO);