obs update

stream-labs · Jun 23, 2023 · a5f79b9 · a5f79b9
1 parent 8028741
commit a5f79b9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 334 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -22,7 +22,7 @@ env:
   SLGenerator: Visual Studio 17 2022
   SLDistributeDirectory: distribute
   SLFullDistributePath: "streamlabs-build.app/distribute" # The .app extension is required to run macOS tests correctly.
-  LibOBSVersion: 28.2.59size5
+  LibOBSVersion: 28.2.59size6
   PACKAGE_NAME: osn
 
 jobs:

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/obs-studio-server/source/osn-sceneitem.cpp b/obs-studio-server/source/osn-sceneitem.cpp
@@ -284,8 +284,12 @@ void osn::SceneItem::GetSize(void *data, const int64_t id, const std::vector<ipc
 		PRETTY_ERROR_RETURN(ErrorCode::InvalidReference, "Item reference is not valid.");
 	}
 
-	vec2 size;
-	obs_sceneitem_get_size(item, &size);
+	vec2 size = {0};
+	obs_source_t *input = obs_sceneitem_get_source(item);
+	if (input) {
+		size.x = obs_source_get_width(input);
+		size.y = obs_source_get_height(input);
+	}
 
 	rval.push_back(ipc::value((uint64_t)ErrorCode::Ok));
 	rval.push_back(ipc::value(size.x));