noobs 0.0.158 → 0.0.177

package/package.json

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

package/src/obs_interface.cpp

@@ -66,10 +66,10 @@ void ObsInterface::load_module(const char* module, const char* data, bool allowF
   blog(LOG_INFO, "Allow fail: %d", allowFail);
 
   obs_module_t *ptr = NULL;
-  int success = obs_open_module(&ptr, module, data);
+  int openmod = obs_open_module(&ptr, module, data);
 
-  if (success != MODULE_SUCCESS) {
-    blog(LOG_ERROR, "Failed to open module: %s", module);
+  if (openmod != MODULE_SUCCESS) {
+    blog(LOG_ERROR, "Failed to open module: %s, %d", module, openmod);
     throw std::runtime_error("Failed to open module!");
   }
 
@@ -612,6 +612,8 @@ void ObsInterface::connect_signal_handlers(obs_output_t *output) {
   signal_handler_connect(sh, "starting", output_signal_handler,  starting_ctx);
   signal_handler_connect(sh, "stopping", output_signal_handler,  stopping_ctx);
   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);
 }
 
 void ObsInterface::disconnect_signal_handlers(obs_output_t *output) {
@@ -620,6 +622,8 @@ void ObsInterface::disconnect_signal_handlers(obs_output_t *output) {
   signal_handler_disconnect(sh, "start", output_signal_handler,  start_ctx);
   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);
 }
 
 bool draw_source_outline(obs_scene_t *scene, obs_sceneitem_t *item, void *p) {
@@ -935,6 +939,8 @@ ObsInterface::ObsInterface(
   start_ctx = new SignalContext{ this, "start" };
   stopping_ctx = new SignalContext{ this, "stopping" };
   stop_ctx = new SignalContext{ this, "stop" };
+  activate_ctx = new SignalContext{this, "activate"};
+  deactivate_ctx = new SignalContext{this, "deactivate"};
 
   // Create the resources we rely on.
   create_scene();
@@ -965,6 +971,8 @@ ObsInterface::~ObsInterface() {
   delete start_ctx;
   delete stopping_ctx;
   delete stop_ctx;
+  delete activate_ctx;
+  delete deactivate_ctx;
 
   for (auto& kv : sources) {
     std::string name = kv.first;

package/src/obs_interface.h

@@ -119,6 +119,8 @@ class ObsInterface {
     SignalContext* start_ctx;
     SignalContext* stopping_ctx;
     SignalContext* stop_ctx;
+    SignalContext* activate_ctx;
+    SignalContext* deactivate_ctx;
     static void output_signal_handler(void *data, calldata_t *cd);
 
     void list_encoders(obs_encoder_type type = OBS_ENCODER_VIDEO);

package/src/utils.cpp

@@ -8,56 +8,56 @@
 #include <windows.h>
 
 void log_handler(int lvl, const char *msg, va_list args, void *p) {
-    static std::ofstream logFile;
-    static bool initialized = false;
-
-    if (!initialized) {
-        // Build log filename
-        auto now = std::chrono::system_clock::now();
-        auto t = std::chrono::system_clock::to_time_t(now);
-        std::stringstream filename;
-        filename << "OBS-" << std::put_time(std::localtime(&t), "%Y-%m-%d") << ".log";
+  static std::stringstream logFileName;
+  static bool logInitialized = false;
+  
+  if (!logInitialized) {
+    // Build the log filename.
+    auto now = std::chrono::system_clock::now();
+    auto t = std::chrono::system_clock::to_time_t(now);
 
-        std::string log_dir = static_cast<const char*>(p);
-        if (!log_dir.empty() && log_dir.back() != '\\' && log_dir.back() != '/')
-            log_dir += '\\';
+    std::string logDir = static_cast<const char*>(p);
 
-        logFile.open(log_dir + filename.str(), std::ios::app);
-        initialized = true;
+    if (!logDir.empty() && logDir.back() != '\\' && logDir.back() != '/') {
+      logDir += '\\';
     }
+      
+    logFileName << logDir << "OBS-" << std::put_time(std::localtime(&t), "%Y-%m-%d") << ".log";
+    logInitialized = true;
+  }
 
-    if (!logFile.is_open()) return;
+  // Timestamp
+  auto now = std::chrono::system_clock::now();
+  auto t = std::chrono::system_clock::to_time_t(now);
+  auto ms = std::chrono::duration_cast<std::chrono::milliseconds>(
+                now.time_since_epoch()) % 1000;
 
-    // Timestamp
-    auto now = std::chrono::system_clock::now();
-    auto t = std::chrono::system_clock::to_time_t(now);
-    auto ms = std::chrono::duration_cast<std::chrono::milliseconds>(
-                  now.time_since_epoch()) % 1000;
+  std::stringstream timestamp;
+  timestamp << "[" << std::put_time(std::localtime(&t), "%Y-%m-%d %H:%M:%S")
+            << "." << std::setfill('0') << std::setw(3) << ms.count() << "] ";
 
-    std::stringstream timestamp;
-    timestamp << "[" << std::put_time(std::localtime(&t), "%Y-%m-%d %H:%M:%S")
-              << "." << std::setfill('0') << std::setw(3) << ms.count() << "] ";
+  // Log level
+  const char* level_str = "UNKNOWN";
+  switch (lvl) {
+      case LOG_ERROR:   level_str = "ERROR"; break;
+      case LOG_WARNING: level_str = "WARN";  break;
+      case LOG_INFO:    level_str = "INFO";  break;
+      case LOG_DEBUG:   level_str = "DEBUG"; break;
+  }
+  timestamp << "[" << level_str << "]  ";
 
-    // Log level
-    const char* level_str = "UNKNOWN";
-    switch (lvl) {
-        case LOG_ERROR:   level_str = "ERROR"; break;
-        case LOG_WARNING: level_str = "WARN";  break;
-        case LOG_INFO:    level_str = "INFO";  break;
-        case LOG_DEBUG:   level_str = "DEBUG"; break;
-    }
-    timestamp << "[" << level_str << "]  ";
+  // Format message
+  char buffer[4096];
+  vsnprintf(buffer, sizeof(buffer), msg, args);
 
-    // Format message
-    char buffer[4096];
-    vsnprintf(buffer, sizeof(buffer), msg, args);
+  // Prepend timestamp and flush per line
+  std::istringstream iss(buffer);
+  std::string line;
+  std::ofstream logFile(logFileName.str(), std::ios::app);
 
-    // Prepend timestamp and flush per line
-    std::istringstream iss(buffer);
-    std::string line;
-    while (std::getline(iss, line)) {
-        logFile << timestamp.str() << line << std::endl;  // std::endl flushes
-    }
+  while (logFile.is_open() && std::getline(iss, line)) {
+    logFile << timestamp.str() << line << std::endl;  // std::endl flushes
+  }
 }
 
 Napi::Object data_to_napi(Napi::Env env, obs_data_t* data) {