noobs 0.0.149 → 0.0.157

package/binding.gyp

@@ -13,7 +13,7 @@
             "include"
         ],
         'libraries': [
-            "../bin/64bit/obs.lib"
+            "../bin/64bit/obs.lib",
         ],
         'dependencies': [
             "<!(node -p \"require('node-addon-api').gyp\")"

package/package.json

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

package/src/obs_interface.cpp

@@ -14,7 +14,6 @@ void call_jscb(Napi::Env env, Napi::Function cb, SignalData* sd) {
   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()));
@@ -61,22 +60,6 @@ void ObsInterface::list_output_types()
   }
 }
 
-bool log_adapter(void *param, const char *node, uint32_t idx)
-{
-  blog(LOG_INFO, "  - %d: %s", idx, node);
-  return true;
-}
-
-void list_adapters()
-{
-  // Pretty sure OBS logs all this stuff anyway but do it ourselves for good measure.
-  obs_enter_graphics();
-  uint32_t count = gs_get_adapter_count();
-  blog(LOG_INFO, "Adapter count: %d", count);
-  gs_enum_adapters(log_adapter, NULL);
-  obs_leave_graphics();
-}
-
 void ObsInterface::load_module(const char* module, const char* data, bool allowFail) {
   blog(LOG_INFO, "Loading module: %s", module);
   blog(LOG_INFO, "Data path: %s", data);
@@ -153,7 +136,7 @@ int ObsInterface::reset_video(int fps, int width, int height) {
   ovi.range = VIDEO_RANGE_PARTIAL;
   ovi.scale_type = OBS_SCALE_BILINEAR;
   ovi.adapter = 0;
-  ovi.gpu_conversion = false;
+  ovi.gpu_conversion = true;
   ovi.graphics_module = "libobs-d3d11.dll"; 
 
   return obs_reset_video(&ovi);
@@ -236,11 +219,11 @@ void ObsInterface::init_obs(const std::string& distPath) {
   }
   
   obs_post_load_modules();
+  register_preview_window_class();
 
   list_encoders();
   list_source_types();
   list_output_types();
-  list_adapters();
 
   blog(LOG_INFO, "Initializing complete");
 }
@@ -770,14 +753,14 @@ void ObsInterface::initPreview(HWND parent) {
   if (!preview_hwnd) {
     blog(LOG_INFO, "Creating preview child window");
 
-    preview_hwnd = CreateWindowExA(
-      0,                      // No extended styles
-      "STATIC",               // Simple static control class (ANSI string)
-      "OBS Preview",          // Window name (ANSI string)
-      WS_CHILD | WS_BORDER,   // Child + border, NOT visible initially
+    preview_hwnd = CreateWindowEx(
+      0,         
+      TEXT("PreviewWindowClass"),   // Window class we already registered earlier
+      TEXT("OBS Preview"),          // Window name 
+      WS_POPUP,
       0, 0,                   // Initial position (x, y)
       0, 0,                   // Initial size (width, height)
-      parent,                 // Parent window (your Electron app)
+      NULL,                   // No parent yet
       NULL,                   // No menu
       GetModuleHandle(NULL),
       NULL
@@ -787,6 +770,17 @@ void ObsInterface::initPreview(HWND parent) {
       blog(LOG_ERROR, "Failed to create preview child window");
       return;
     }
+
+    SetParent(preview_hwnd, parent);
+
+    LONG_PTR style = GetWindowLongPtr(preview_hwnd, GWL_STYLE);
+    style &= ~WS_POPUP;
+    style |= WS_CHILD;
+    SetWindowLongPtr(preview_hwnd, GWL_STYLE, style);
+
+    LONG_PTR exStyle = GetWindowLongPtr(preview_hwnd, GWL_EXSTYLE);
+    exStyle |= WS_EX_TRANSPARENT;
+    SetWindowLongPtr(preview_hwnd, GWL_EXSTYLE, exStyle);
   }
 
   if (!display) {
@@ -817,11 +811,16 @@ void ObsInterface::initPreview(HWND parent) {
 void ObsInterface::configurePreview(int x, int y, int width, int height) {
   blog(LOG_INFO, "ObsInterface::configurePreview");
 
-  if (!preview_hwnd || !display) {
+  if (!preview_hwnd) {
     blog(LOG_ERROR, "Preview window not initialized");
     return;
   }
 
+  if (!display) {
+    blog(LOG_ERROR, "Preview display not initialized");
+    return;
+  }
+
   blog(LOG_INFO, "Moving preview child window to (%d, %d) with size (%d x %d)", x, y, width, height);
 
   // Resize and move the existing child window.
@@ -845,11 +844,16 @@ void ObsInterface::configurePreview(int x, int y, int width, int height) {
 void ObsInterface::showPreview() {
   blog(LOG_INFO, "ObsInterface::showPreview");
 
-  if (!preview_hwnd || !display) {
+  if (!preview_hwnd) {
     blog(LOG_ERROR, "Preview window not initialized");
     return;
   }
 
+  if (!display) {
+    blog(LOG_ERROR, "Preview display not initialized");
+    return;
+  }
+
   ShowWindow(preview_hwnd, SW_SHOW);
   obs_display_set_enabled(display, true);
 }
@@ -867,7 +871,7 @@ void ObsInterface::disablePreview() {
   blog(LOG_INFO, "ObsInterface::disablePreview");
 
   if (!display) {
-    blog(LOG_ERROR, "Preview window not initialized");
+    blog(LOG_ERROR, "Preview display not initialized");
     return;
   }
 

package/src/utils.cpp

@@ -5,6 +5,7 @@
 #include <iomanip>
 #include <sstream>
 #include "utils.h"
+#include <windows.h>
 
 void log_handler(int lvl, const char *msg, va_list args, void *p) {
     static std::ofstream logFile;
@@ -381,3 +382,41 @@ std::string get_current_date_time() {
     ss << std::put_time(std::localtime(&time_t), "%Y-%m-%d %H-%M-%S");
     return ss.str();
 }
+
+LRESULT CALLBACK DisplayWndProc(
+  _In_ HWND hwnd, 
+  _In_ UINT uMsg, 
+  _In_ WPARAM wParam, 
+  _In_ LPARAM lParam)
+{
+	switch (uMsg) {
+	case WM_NCHITTEST:
+		return HTTRANSPARENT;
+	}
+
+	return DefWindowProc(hwnd, uMsg, wParam, lParam);
+}
+
+void register_preview_window_class() {
+  WNDCLASSEX klass;
+  
+  klass.cbSize = sizeof(WNDCLASSEX);
+	klass.style = CS_NOCLOSE | CS_HREDRAW | CS_VREDRAW | CS_OWNDC;
+	klass.lpfnWndProc = DisplayWndProc;
+	klass.cbClsExtra = 0;
+	klass.cbWndExtra = 0;
+	klass.hInstance = GetModuleHandle(NULL);
+	klass.hIcon = NULL;
+	klass.hCursor = NULL;
+	klass.hbrBackground = NULL;
+	klass.lpszMenuName = NULL;
+	klass.lpszClassName = TEXT("PreviewWindowClass");
+	klass.hIconSm = NULL;
+
+	if (RegisterClassEx(&klass) == NULL) {
+		blog(LOG_ERROR, "Failed to register window class");
+    throw new std::runtime_error("Failed to register window class");
+	}
+
+  blog(LOG_INFO, "Registered preview window class");
+}

package/src/utils.h

@@ -3,6 +3,7 @@
 #include <napi.h>
 #include <obs.h>
 
+void register_preview_window_class();
 void log_handler(int lvl, const char *msg, va_list args, void *p);
 
 Napi::Object data_to_napi(Napi::Env env,obs_data_t* data);