noobs 0.0.131 → 0.0.142

package/README.md

@@ -11,6 +11,8 @@ Uses a [custom](https://github.com/aza547/warcraft-recorder-obs-studio) fork of
 - Enable "replay_buffer to recording".
 - Allow libobs to be used as a library easier.
 
+Windows is the only supported platform.
+
 ## Installation
 
 ```bash
@@ -25,10 +27,9 @@ import noobs from 'noobs';
 
 const distPath = ...;
 const logPath = ...;
-const recordingPath = ...;
 const cb = (signal) => console.log(signal);
 
-noobs.Init(distPath, logPath, recordingPath, cb);
+noobs.Init(distPath, logPath, cb);
 ...
 noobs.Shutdown();
 ```

package/index.d.ts

@@ -147,6 +147,10 @@ export type SceneItemPosition = {
   y: number; // Y position in pixels
   scaleX: number; // X scaling factor
   scaleY: number; // Y scaling factor
+  cropLeft: number; // Pixels to crop from the left
+  cropRight: number; // Pixels to crop from the right
+  cropTop: number; // Pixels to crop from the top
+  cropBottom: number; // Pixels to crop from the bottom
 };
 
 export type SourceDimensions = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "noobs",
-  "version": "0.0.131",
+  "version": "0.0.142",
   "description": "A native Node.js addon with libobs bindings for Warcraft Recorder.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -9,6 +9,8 @@
   },
   "scripts": {
     "build": "node-gyp rebuild && node dist.js",
+    "test-errors": "ts-node --project test/tsconfig.json test/errors.ts",
+    "test-preview": "ts-node --project test/tsconfig.json test/preview.ts",
     "configure-cursor-anysphere": "node-gyp configure -- -f compile_commands_json && copy build\\Release\\compile_commands.json src\\compile_commands.json"
   },
   "files": [
@@ -24,7 +26,8 @@
   "license": "LGPL-2.0",
   "devDependencies": {
     "@types/node": "^24.1.0",
-    "node-gyp": "^11.2.0"
+    "node-gyp": "^11.2.0",
+    "ts-node": "^10.9.2"
   },
   "dependencies": {
     "node-addon-api": "^8.4.0"

package/src/main.cpp

@@ -37,7 +37,8 @@ Napi::Value ObsShutdown(const Napi::CallbackInfo& info) {
 Napi::Value ObsSetRecordingDir(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsSetRecordingDir called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   bool valid = info.Length() == 1 && info[0].IsString();
@@ -55,7 +56,8 @@ Napi::Value ObsSetRecordingDir(const Napi::CallbackInfo& info) {
 Napi::Value ObsResetVideoContext(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsResetVideoContext called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   bool valid = info.Length() == 3 && info[0].IsNumber() && info[1].IsNumber() && info[2].IsNumber();
@@ -76,7 +78,8 @@ Napi::Value ObsResetVideoContext(const Napi::CallbackInfo& info) {
 Napi::Value ObsListVideoEncoders(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsListVideoEncoders called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   bool valid = info.Length() == 0;
@@ -99,7 +102,8 @@ Napi::Value ObsListVideoEncoders(const Napi::CallbackInfo& info) {
 Napi::Value ObsSetVideoEncoder(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsSetVideoEncoder called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   bool valid = info.Length() == 2 &&
@@ -125,7 +129,8 @@ Napi::Value ObsSetBuffering(const Napi::CallbackInfo& info) {
 
   if (!obs) {
     blog(LOG_ERROR, "ObsSetBuffering called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   bool valid = info.Length() == 1 && info[0].IsBoolean();
@@ -146,7 +151,8 @@ Napi::Value ObsStartBuffer(const Napi::CallbackInfo& info) {
 
   if (!obs) {
     blog(LOG_ERROR, "ObsStartBuffer called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   obs->startBuffering();
@@ -156,7 +162,8 @@ Napi::Value ObsStartBuffer(const Napi::CallbackInfo& info) {
 Napi::Value ObsStartRecording(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsStartRecording called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   int offset = 0;
@@ -172,7 +179,8 @@ Napi::Value ObsStartRecording(const Napi::CallbackInfo& info) {
 Napi::Value ObsStopRecording(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsStopRecording called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   obs->stopRecording();
@@ -182,7 +190,8 @@ Napi::Value ObsStopRecording(const Napi::CallbackInfo& info) {
 Napi::Value ObsForceStopRecording(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsForceStopRecording called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   obs->forceStopRecording();
@@ -192,7 +201,8 @@ Napi::Value ObsForceStopRecording(const Napi::CallbackInfo& info) {
 Napi::Value ObsGetLastRecording(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsGetLastRecording called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   std::string lastRecording = obs->getLastRecording();
@@ -204,7 +214,8 @@ Napi::Value ObsInitPreview(const Napi::CallbackInfo& info) {
 
   if (!obs) {
     blog(LOG_ERROR, "ObsInitPreview called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   bool valid = info.Length() == 1 && info[0].IsBuffer();
@@ -231,7 +242,8 @@ Napi::Value ObsConfigurePreview(const Napi::CallbackInfo& info) {
 
   if (!obs) {
     blog(LOG_ERROR, "ObsConfigurePreview called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   bool valid = info.Length() == 4 &&
@@ -259,7 +271,8 @@ Napi::Value ObsShowPreview(const Napi::CallbackInfo& info) {
 
   if (!obs) {
     blog(LOG_ERROR, "ObsShowPreview called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   obs->showPreview();
@@ -269,7 +282,8 @@ Napi::Value ObsShowPreview(const Napi::CallbackInfo& info) {
 Napi::Value ObsHidePreview(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsHidePreview called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   obs->hidePreview();
@@ -279,7 +293,8 @@ Napi::Value ObsHidePreview(const Napi::CallbackInfo& info) {
 Napi::Value ObsDisablePreview(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsDisablePreview called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   obs->disablePreview();
@@ -289,7 +304,8 @@ Napi::Value ObsDisablePreview(const Napi::CallbackInfo& info) {
 Napi::Value ObsGetPreviewInfo(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsGetPreviewInfo called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   PreviewInfo previewInfo = obs->getPreviewInfo();
@@ -306,7 +322,8 @@ Napi::Value ObsGetPreviewInfo(const Napi::CallbackInfo& info) {
 Napi::Value ObsCreateSource(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsCreateSource called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   bool valid = info.Length() == 2 &&
@@ -328,7 +345,8 @@ Napi::Value ObsCreateSource(const Napi::CallbackInfo& info) {
 Napi::Value ObsDeleteSource(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsDeleteSource called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   bool valid = info.Length() == 1 && info[0].IsString();
@@ -346,7 +364,9 @@ Napi::Value ObsDeleteSource(const Napi::CallbackInfo& info) {
 Napi::Value ObsGetSourceSettings(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsGetSourceSettings called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Env env = info.Env();
+    Napi::Error::New(env, "Obs not initialized").ThrowAsJavaScriptException();
+    return env.Undefined();
   }
 
   bool valid = info.Length() == 1 && info[0].IsString();
@@ -368,7 +388,8 @@ Napi::Value ObsGetSourceSettings(const Napi::CallbackInfo& info) {
 Napi::Value ObsSetSourceSettings(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsSetSourceSettings called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   bool valid = info.Length() == 2 && info[0].IsString() && info[1].IsObject();
@@ -391,7 +412,8 @@ Napi::Value ObsSetSourceSettings(const Napi::CallbackInfo& info) {
 Napi::Value ObsGetSourceProperties(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsGetSourceProperties called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   bool valid = info.Length() == 1 && info[0].IsString();
@@ -413,7 +435,8 @@ Napi::Value ObsGetSourceProperties(const Napi::CallbackInfo& info) {
 Napi::Value ObsSetMuteAudioInputs(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsSetMuteAudioInputs called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   bool valid = info.Length() == 1 && info[0].IsBoolean();
@@ -431,7 +454,8 @@ Napi::Value ObsSetMuteAudioInputs(const Napi::CallbackInfo& info) {
 Napi::Value ObsSetSourceVolume(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsSetSourceVolume called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   bool valid = info.Length() == 2 && info[0].IsString() && info[1].IsNumber();
@@ -450,7 +474,8 @@ Napi::Value ObsSetSourceVolume(const Napi::CallbackInfo& info) {
 Napi::Value ObsSetVolmeterEnabled(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsSetVolmeterEnabled called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   bool valid = info.Length() == 1 && info[0].IsBoolean();
@@ -469,7 +494,8 @@ Napi::Value ObsSetVolmeterEnabled(const Napi::CallbackInfo& info) {
 Napi::Value ObsSetAudioSuppression(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsSetAudioSuppression called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   bool valid = info.Length() == 1 && info[0].IsBoolean();
@@ -487,7 +513,8 @@ Napi::Value ObsSetAudioSuppression(const Napi::CallbackInfo& info) {
 Napi::Value ObsSetForceMono(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsSetForceMono called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   bool valid = info.Length() == 1 && info[0].IsBoolean();
@@ -505,7 +532,8 @@ Napi::Value ObsSetForceMono(const Napi::CallbackInfo& info) {
 Napi::Value ObsAddSourceToScene(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsAddSourceToScene called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   bool valid = info.Length() == 1 && info[0].IsString();
@@ -524,7 +552,8 @@ Napi::Value ObsAddSourceToScene(const Napi::CallbackInfo& info) {
 Napi::Value ObsRemoveSourceFromScene(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsRemoveSourceFromScene called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   bool valid = info.Length() == 1 && info[0].IsString();
@@ -542,7 +571,8 @@ Napi::Value ObsRemoveSourceFromScene(const Napi::CallbackInfo& info) {
 Napi::Value ObsGetSourcePos(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsGetSourcePos called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   bool valid = info.Length() == 1 && info[0].IsString();
@@ -554,23 +584,32 @@ Napi::Value ObsGetSourcePos(const Napi::CallbackInfo& info) {
 
   std::string name = info[0].As<Napi::String>().Utf8Value();
 
-  vec2 pos; vec2 size; vec2 scale;
-  obs->getSourcePos(name, &pos, &size, &scale);
+  vec2 pos; vec2 size; vec2 scale; obs_sceneitem_crop crop;
+  obs->getSourcePos(name, &pos, &size, &scale, &crop);
 
   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));
+
+  result.Set("cropLeft", Napi::Number::New(info.Env(), crop.left));
+  result.Set("cropRight", Napi::Number::New(info.Env(), crop.right));
+  result.Set("cropTop", Napi::Number::New(info.Env(), crop.top));
+  result.Set("cropBottom", Napi::Number::New(info.Env(), crop.bottom));
+
   return result;
 }
 
 Napi::Value ObsSetSourcePos(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsSetSourcePos called but obs is not initialized");
-    throw std::runtime_error("Obs not initialized");
+    Napi::Error::New(info.Env(), "Obs not initialized").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
   }
 
   bool valid = info.Length() == 2 &&
@@ -593,7 +632,13 @@ Napi::Value ObsSetSourcePos(const Napi::CallbackInfo& info) {
   float scaleY = position.Get("scaleY").As<Napi::Number>().FloatValue();
   vec2 scale = { scaleX, scaleY };
 
-  obs->setSourcePos(name, &pos, &scale);
+  int cropLeft = position.Get("cropLeft").As<Napi::Number>().Int32Value();
+  int cropRight = position.Get("cropRight").As<Napi::Number>().Int32Value();
+  int cropTop = position.Get("cropTop").As<Napi::Number>().Int32Value();
+  int cropBottom = position.Get("cropBottom").As<Napi::Number>().Int32Value();
+  obs_sceneitem_crop crop = { cropLeft, cropTop, cropRight, cropBottom }; // Careful with ordering.
+
+  obs->setSourcePos(name, &pos, &scale, &crop);
   return info.Env().Undefined();
 }
 

package/src/obs_interface.cpp

@@ -597,14 +597,15 @@ void ObsInterface::disconnect_signal_handlers(obs_output_t *output) {
 
 bool draw_source_outline(obs_scene_t *scene, obs_sceneitem_t *item, void *p) {
   // Get the item position and size
-  vec2 pos; vec2 scale;
+  vec2 pos; vec2 scale; obs_sceneitem_crop crop;
   obs_sceneitem_get_pos(item, &pos);
   obs_sceneitem_get_scale(item, &scale);
+  obs_sceneitem_get_crop(item, &crop);
 
-  // Calculate actual size with scaling
+  // Calculate actual size, accounting for scaling and cropping.
   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;
+  float width =  (obs_source_get_width(src) - crop.left - crop.right) * scale.x;
+  float height = (obs_source_get_height(src) - crop.top - crop.bottom) * scale.y;
 
   if (width <= 0 || height <= 0) {
     // Don't want to call gs_draw_sprite with zero width or height.
@@ -634,7 +635,7 @@ bool draw_source_outline(obs_scene_t *scene, obs_sceneitem_t *item, void *p) {
 
   // Bottom border
   gs_matrix_push();
-  gs_matrix_translate3f(pos.x, pos.y + height - 4.0f, 0.0f);
+  gs_matrix_translate3f(pos.x, pos.y  + height - 4.0f, 0.0f);
   gs_draw_sprite(nullptr, 0, width, 4.0f);
   gs_matrix_pop();
 
@@ -652,7 +653,7 @@ bool draw_source_outline(obs_scene_t *scene, obs_sceneitem_t *item, void *p) {
 
   // Dragging point box (25x25 pixels in bottom-right corner)
   gs_matrix_push();
-  gs_matrix_translate3f(pos.x + width - 25.0f, pos.y + height - 25.0f, 0.0f);
+  gs_matrix_translate3f(pos.x + width - 25.0f, pos.y  + height - 25.0f, 0.0f);
   gs_draw_sprite(nullptr, 0, 25.0f, 25.0f);
   gs_matrix_pop();
 
@@ -1164,7 +1165,7 @@ void ObsInterface::removeSourceFromScene(std::string name) {
   blog(LOG_INFO, "ObsInterface::removeSourceFromScene exited");
 }
 
-void ObsInterface::getSourcePos(std::string name, vec2* pos, vec2* size, vec2* scale) 
+void ObsInterface::getSourcePos(std::string name, vec2* pos, vec2* size, vec2* scale, obs_sceneitem_crop* crop) 
 {
   auto it = sources.find(name);
 
@@ -1189,13 +1190,14 @@ void ObsInterface::getSourcePos(std::string name, vec2* pos, vec2* size, vec2* s
 
   obs_sceneitem_get_pos(item, pos);
   obs_sceneitem_get_scale(item, scale);
+  obs_sceneitem_get_crop(item, crop);
 
   // Pre-scaled sizes.
   size->x = obs_source_get_width(source);
   size->y = obs_source_get_height(source);
 }
 
-void ObsInterface::setSourcePos(std::string name, vec2* pos, vec2* scale) {
+void ObsInterface::setSourcePos(std::string name, vec2* pos, vec2* scale, obs_sceneitem_crop* crop) {
   obs_sceneitem_t *item = obs_scene_find_source(scene, name.c_str());
 
   if (!item) {
@@ -1205,6 +1207,7 @@ void ObsInterface::setSourcePos(std::string name, vec2* pos, vec2* scale) {
 
   obs_sceneitem_set_pos(item, pos);
   obs_sceneitem_set_scale(item, scale);
+  obs_sceneitem_set_crop(item, crop);
 }
 
 std::vector<std::string> ObsInterface::listAvailableVideoEncoders()

package/src/obs_interface.h

@@ -67,8 +67,8 @@ class ObsInterface {
 
     void addSourceToScene(std::string name); // Add source to scene.
     void removeSourceFromScene(std::string name); // Remove source from scene.
-    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 getSourcePos(std::string name, vec2* pos, vec2* size, vec2* scale, obs_sceneitem_crop* crop); // Size is returned to allow clients to calculate scale.
+    void setSourcePos(std::string name, vec2* pos, vec2* scale, obs_sceneitem_crop* crop); // 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 configurePreview(int x, int y, int width, int height); // Move and resize the preview display.