noobs 0.0.31 → 0.0.33

package/index.d.ts

@@ -1,6 +1,18 @@
-type Signal = { // TODO export type? 
-  id: string;
-  code: number;
+export type Signal = {
+  id: string;   // Signal identifier, e.g. "stop"
+  code: number; // 0 for success, other values for errors
+}
+
+export type SceneItemPosition = {
+  x: number;      // X position in pixels
+  y: number;      // Y position in pixels
+  scaleX: number; // X scaling factor
+  scaleY: number; // Y scaling factor
+};
+
+export type SourceDimensions = {
+  height: number; // Height in pixels, before scaling
+  width: number;  // Width in pixels, before scaling
 }
 
 interface Noobs {
@@ -18,7 +30,8 @@ interface Noobs {
   StopRecording(): void;
   GetLastRecording(): string;
 
-  UpdateSource(x: number, y: number, scale: number): void;
+  GetSourcePos(src: string): SceneItemPosition & SourceDimensions;
+  SetSourcePos(src: string, pos: SceneItemPosition): void;
 
   InitPreview(hwnd: Buffer): void;
   ShowPreview(x: number, y: number, width: number, height: number): void;
@@ -26,4 +39,4 @@ interface Noobs {
 }
 
 declare const noobs: Noobs;
-export = noobs;
+export default noobs;

package/package.json

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

package/src/main.cpp

@@ -157,22 +157,63 @@ Napi::Value ObsHidePreview(const Napi::CallbackInfo& info) {
   return info.Env().Undefined();
 }
 
-Napi::Value ObsUpdateSourcePos(const Napi::CallbackInfo& info) {
+Napi::Value ObsGetSourcePos(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsUpdateSource called but obs is not initialized");
     throw std::runtime_error("Obs not initialized");
   }
 
-  bool valid = info.Length() == 3 &&
-    info[0].IsNumber() && // X position (px)
-    info[1].IsNumber() && // Y position (px)
-    info[2].IsNumber();   // Scale (multiplier)
+  bool valid = info.Length() == 1 && info[0].IsString();
 
-  int x = info[0].As<Napi::Number>().Int32Value();
-  int y = info[1].As<Napi::Number>().Int32Value();
-  float scale = info[2].As<Napi::Number>().FloatValue();
+  if (!valid) {
+    Napi::TypeError::New(info.Env(), "Invalid arguments passed to ObsGetSourcePos").ThrowAsJavaScriptException();
+    return info.Env().Undefined();  
+  }
+
+  std::string name = info[0].As<Napi::String>().Utf8Value();
+
+  vec2 pos; vec2 size; vec2 scale;
+  obs->getSourcePos(name, &pos, &size, &scale);
+
+  Napi::Object result = Napi::Object::New(info.Env());
+  result.Set("x", Napi::Number::New(info.Env(), pos.x));
+  result.Set("y", Napi::Number::New(info.Env(), pos.y));
+  result.Set("width", Napi::Number::New(info.Env(), size.x));
+  result.Set("height", Napi::Number::New(info.Env(), size.y));
+  result.Set("scaleX", Napi::Number::New(info.Env(), scale.x));
+  result.Set("scaleY", Napi::Number::New(info.Env(), scale.y));
+  return result;
+}
+
+Napi::Value ObsSetSourcePos(const Napi::CallbackInfo& info) {
+  if (!obs) {
+    blog(LOG_ERROR, "ObsUpdateSource called but obs is not initialized");
+    throw std::runtime_error("Obs not initialized");
+  }
+
+  bool valid = info.Length() == 5 &&
+    info[0].IsString() && // Source name
+    info[1].IsNumber() && // X position (px)
+    info[2].IsNumber() && // Y position (px)
+    info[3].IsNumber() && // Scale factor (X)
+    info[4].IsNumber();   // Scale factor (Y)
+
+  if (!valid) {
+    Napi::TypeError::New(info.Env(), "Invalid arguments passed to ObsSetSourcePos").ThrowAsJavaScriptException();
+    return info.Env().Undefined();  
+  }
+
+  std::string name = info[0].As<Napi::String>().Utf8Value();
+
+  float x = info[1].As<Napi::Number>().FloatValue();
+  float y = info[2].As<Napi::Number>().FloatValue();
+  vec2 pos = { x, y };
+
+  float scaleX = info[3].As<Napi::Number>().FloatValue();
+  float scaleY = info[4].As<Napi::Number>().FloatValue();
+  vec2 scale = { scaleX, scaleY };
 
-  obs->updateSourcePos(x, y, scale);
+  obs->setSourcePos(name, &pos, &scale);
   return info.Env().Undefined();
 }
 
@@ -185,7 +226,8 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) {
   exports.Set("StopRecording", Napi::Function::New(env, ObsStopRecording));
   exports.Set("GetLastRecording", Napi::Function::New(env, ObsGetLastRecording));
 
-  exports.Set("UpdateSourcePos", Napi::Function::New(env, ObsUpdateSourcePos));
+  exports.Set("GetSourcePos", Napi::Function::New(env, ObsGetSourcePos));
+  exports.Set("SetSourcePos", Napi::Function::New(env, ObsSetSourcePos));
 
   exports.Set("InitPreview", Napi::Function::New(env, ObsInitPreview));
   exports.Set("ShowPreview", Napi::Function::New(env, ObsShowPreview));

package/src/obs_interface.cpp

@@ -613,18 +613,42 @@ std::string ObsInterface::getLastRecording() {
   return path;
 }
 
-void ObsInterface::updateSourcePos(int x, int y, float scale) {
-  blog(LOG_INFO, "ObsInterface::moveSource called at (%d, %d)", x, y);
-  obs_sceneitem_t *item = obs_scene_find_source(scene, "video_source");
+void ObsInterface::getSourcePos(std::string name, vec2* pos, vec2* size, vec2* scale) 
+{
+  blog(LOG_INFO, "ObsInterface::getSourcePos called");
+
+  obs_source_t *src = obs_get_source_by_name(name.c_str());
+  obs_sceneitem_t *item = obs_scene_find_source(scene, name.c_str());
+
+  if (!src) {
+    blog(LOG_ERROR, "Did not find source for video  ");
+    return;
+  }
 
   if (!item) {
     blog(LOG_ERROR, "Did not find scene item for video source");
     return;
   }
 
-  struct vec2 pos = { (float)x, (float)y };
-  obs_sceneitem_set_pos(item, &pos);
+  obs_sceneitem_get_pos(item, pos);
+  obs_sceneitem_get_scale(item, scale);
+
+  // Pre-scaled sizes.
+  size->x = obs_source_get_width(src);
+  size->y = obs_source_get_height(src);
+
+  blog(LOG_INFO, "ObsInterface::getSourcePos exited");
+}
+
+void ObsInterface::setSourcePos(std::string name, vec2* pos, vec2* scale) {
+  blog(LOG_INFO, "ObsInterface::moveSource called");
+  obs_sceneitem_t *item = obs_scene_find_source(scene, name.c_str());
+
+  if (!item) {
+    blog(LOG_ERROR, "Did not find scene item for video source");
+    return;
+  }
 
-  struct vec2 scalep = { scale, scale };
-  obs_sceneitem_set_scale(item, &scalep);
+  obs_sceneitem_set_pos(item, pos);
+  obs_sceneitem_set_scale(item, scale);
 }

package/src/obs_interface.h

@@ -24,7 +24,8 @@ class ObsInterface {
     void stopRecording();
     std::string getLastRecording();
 
-    void updateSourcePos(int x, int y, float scale);
+    void getSourcePos(std::string name, vec2* pos, vec2* size, vec2* scale); // Size is returned to allow clients to calculate scale.
+    void setSourcePos(std::string name, vec2* pos, vec2* scale); // Size does not get set here because it's set by the source itself.
 
     void initPreview(HWND parent); // Must call this before showPreview to setup resources.
     void showPreview(int x, int y, int width, int height); // Also used for moving and resizing.