noobs 0.0.60 → 0.0.63

package/index.js

@@ -1,7 +1,7 @@
 const path = require('path');
 
 process.env.Path += ";";
-process.env.Path += path.resolve(__dirname, 'dist', 'bin');
+process.env.Path += path.resolve(__dirname, 'dist', 'bin').replace('app.asar', 'app.asar.unpacked');
 
 const packageName = 'noobs.node';
 const noobs = require(`./dist/${packageName}`)

package/package.json

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

package/src/main.cpp

@@ -54,7 +54,7 @@ Napi::Value ObsSetRecordingDir(const Napi::CallbackInfo& info) {
   }
 
   std::string recordingPath = info[0].As<Napi::String>().Utf8Value();
-  obs->updateRecordingDir(recordingPath);
+  obs->setRecordingDir(recordingPath);
   return info.Env().Undefined();
 }
 

package/src/obs_interface.cpp

@@ -238,8 +238,9 @@ void ObsInterface::create_output(const std::string& recordingPath, bool bufferin
   create_signal_handlers(output);
 }
 
-void ObsInterface::updateRecordingDir(const std::string& recordingPath) {
-  blog(LOG_INFO, "Updating recording directory");
+void ObsInterface::setRecordingDir(const std::string& recordingPath) {
+  blog(LOG_INFO, "Set recording directory");
+  // TODO make this work for file output also.
 
   if (!output) {
     blog(LOG_ERROR, "No output to update recording directory");
@@ -481,68 +482,60 @@ void ObsInterface::create_signal_handlers(obs_output_t *output) {
 }
 
 bool draw_box(obs_scene_t *scene, obs_sceneitem_t *item, void *p) {
-    // Get the item position and size
-    vec2 pos; vec2 scale;
+  // Get the item position and size
+  vec2 pos; vec2 scale;
+  obs_sceneitem_get_pos(item, &pos);
+  obs_sceneitem_get_scale(item, &scale);
 
-    obs_sceneitem_get_pos(item, &pos);
-    obs_sceneitem_get_scale(item, &scale);
+  // Calculate actual size with scaling
+  obs_source_t *src = obs_sceneitem_get_source(item);
+  float width =  obs_source_get_width(src) * scale.x;
+  float height = obs_source_get_height(src) * scale.y;
 
-    obs_source_t *src = obs_sceneitem_get_source(item);
-    uint32_t sizex = obs_source_get_width(src);
-    uint32_t sizey = obs_source_get_height(src);
+  // Draw rectangle around the source using the position and size
+  gs_effect_t *solid = obs_get_base_effect(OBS_EFFECT_SOLID);
+  gs_eparam_t *color = gs_effect_get_param_by_name(solid, "color");
+  gs_technique_t *tech = gs_effect_get_technique(solid, "Solid");
 
-    // Calculate actual size with scaling
-    float width = sizex * scale.x;
-    float height = sizey * scale.y;
+  vec4 col = {0.733f, 0.267f, 0.125f, 1.0f}; // #BB4420
+  gs_effect_set_vec4(color, &col);
 
-    // Draw rectangle around the source using the position and size
-    gs_effect_t *solid = obs_get_base_effect(OBS_EFFECT_SOLID);
-    gs_eparam_t *color = gs_effect_get_param_by_name(solid, "color");
-    gs_technique_t *tech = gs_effect_get_technique(solid, "Solid");
+  gs_technique_begin(tech);
+  gs_technique_begin_pass(tech, 0);
 
-    vec4 col = {0.733f, 0.267f, 0.125f, 1.0f}; // #BB4420
-    gs_effect_set_vec4(color, &col);
+  gs_matrix_push();
+  gs_matrix_identity();
 
-    gs_technique_begin(tech);
-    gs_technique_begin_pass(tech, 0);
+  // Top border
+  gs_matrix_push();
+  gs_matrix_translate3f(pos.x, pos.y, 0.0f);
+  gs_draw_sprite(nullptr, 0, width, 2.0f);
+  gs_matrix_pop();
 
-    gs_matrix_push();
-    gs_matrix_identity();
+  // Bottom border
+  gs_matrix_push();
+  gs_matrix_translate3f(pos.x, pos.y + height - 2.0f, 0.0f);
+  gs_draw_sprite(nullptr, 0, width, 2.0f);
+  gs_matrix_pop();
 
-    // Top border
-    gs_matrix_push();
-    gs_matrix_translate3f(pos.x, pos.y, 0.0f);
-    //gs_matrix_scale3f(width, 1.0f, 1.0f);
-    gs_draw_sprite(nullptr, 0, width, 1.0f);
-    gs_matrix_pop();
+  // Left border
+  gs_matrix_push();
+  gs_matrix_translate3f(pos.x, pos.y, 0.0f);
+  gs_draw_sprite(nullptr, 0, 2.0f, height);
+  gs_matrix_pop();
 
-    // Bottom border
-    gs_matrix_push();
-    gs_matrix_translate3f(pos.x, pos.y + height - 1.0f, 0.0f);
-    // gs_matrix_scale3f(width, 1.0f, 1.0f);
-    gs_draw_sprite(nullptr, 0, width, 1.0f);
-    gs_matrix_pop();
+  // Right border
+  gs_matrix_push();
+  gs_matrix_translate3f(pos.x + width - 2.0f, pos.y, 0.0f);
+  gs_draw_sprite(nullptr, 0, 2.0f, height);
+  gs_matrix_pop();
 
-    // Left border
-    gs_matrix_push();
-    gs_matrix_translate3f(pos.x, pos.y, 0.0f);
-    // gs_matrix_scale3f(1.0f, height, 1.0f);
-    gs_draw_sprite(nullptr, 0, 1.0f, height);
-    gs_matrix_pop();
+  gs_matrix_pop();
 
-    // Right border
-    gs_matrix_push();
-    gs_matrix_translate3f(pos.x + width - 1.0f, pos.y, 0.0f);
-    //  gs_matrix_scale3f(1.0f, height, 1.0f);
-    gs_draw_sprite(nullptr, 0, 1.0f, height);
-    gs_matrix_pop();
+  gs_technique_end_pass(tech);
+  gs_technique_end(tech);
 
-    gs_matrix_pop();
-
-    gs_technique_end_pass(tech);
-    gs_technique_end(tech);
-
-    return true;
+  return true;
 }
 
 void draw_callback(void* data, uint32_t cx, uint32_t cy) {
@@ -809,9 +802,8 @@ std::string ObsInterface::getLastRecording() {
 
   const char* type = obs_output_get_id(output);
 
-
-
   if (strcmp(type, "ffmpeg_muxer") == 0) {
+    blog(LOG_INFO, "Getting last recording path from ffmpeg_muxer");
     return recording_path;
   }
 
@@ -822,6 +814,8 @@ std::string ObsInterface::getLastRecording() {
     throw std::runtime_error("Unknown output type!");
   }
 
+  success = proc_handler_call(ph, "get_last_replay", &cd);
+
   if (!success) {
     blog(LOG_ERROR, "Failed to call procedure handler");
     const char *err = obs_output_get_last_error(output);

package/src/obs_interface.h

@@ -24,7 +24,7 @@ class ObsInterface {
     void startRecording(int offset);   // Convert the active buffered recording to a real one.
     void stopRecording();              // Stop the recording.
     std::string getLastRecording();    // Get the last recorded file path.
-    void updateRecordingDir(const std::string& recordingPath); // Output must not be active when calling this.
+    void setRecordingDir(const std::string& recordingPath); // Output must not be active when calling this.
 
     void createSource(std::string name, std::string type);          // Create a new source
     void deleteSource(std::string name);                            // Release a source.