noobs 0.0.144 → 0.0.146

package/package.json

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

package/src/obs_interface.cpp

@@ -10,14 +10,20 @@
 
 void call_jscb(Napi::Env env, Napi::Function cb, SignalData* sd) {
   Napi::Object obj = Napi::Object::New(env);
+
   obj.Set("type", Napi::String::New(env, sd->type));
   obj.Set("id", Napi::String::New(env, sd->id));
   obj.Set("code", Napi::Number::New(env, sd->code));
+  
 
   if (sd->value.has_value()) {
     obj.Set("value", Napi::Number::New(env, sd->value.value()));
   }
 
+  if (sd->error.has_value()) {
+    obj.Set("error", Napi::String::New(env, sd->error.value()));
+  }
+
   cb.Call({ obj });
   delete sd;
 }
@@ -571,11 +577,25 @@ 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");
+
+  std::optional<std::string> error;
+
+  if (err) {
+    error = std::string(err);
+  }
 
   SignalContext* ctx = static_cast<SignalContext*>(data);
   ObsInterface* self = ctx->self;
 
-  SignalData* sd = new SignalData{ "output", ctx->id.c_str(), code };
+  SignalData* 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);
 }
 
@@ -695,7 +715,10 @@ void draw_callback(void* data, uint32_t cx, uint32_t cy) {
   gs_set_viewport(previewX, previewY, previewCX, previewCY);
 
   // Renders the scene now the graphics context is setup.
-  obs_render_main_texture();
+  // obs_render_main_texture();
+  obs_source_t *source = obs_scene_get_source(obsInterface->scene);
+  if (source)
+    obs_source_video_render(source);
 
   // Draw boxes around sources, if enabled.
   if (obsInterface->getDrawSourceOutlineEnabled()) {

package/src/obs_interface.h

@@ -18,6 +18,7 @@ struct SignalData {
   std::string id;
   long long code;
   std::optional<float> value;
+  std::optional<std::string> error;
 };
 
 struct SignalContext {
@@ -91,9 +92,10 @@ class ObsInterface {
     void sourceCallback(std::string name); // Send callback for source change.
     void zeroVolmeter(std::string name); // Zero the volmeter for a source.
 
+    obs_scene_t *scene = nullptr;
+
   private:
     obs_output_t *output = nullptr;
-    obs_scene_t *scene = nullptr;
 
     obs_encoder_t *video_encoder = nullptr;
     obs_encoder_t *audio_encoder = nullptr;