Merge pull request #76 from stream-labs/display-creation

Add size and position on display creation

Author: eddyStreamlabs

obs-studio-client/source/nodeobs_display.cpp

@@ -41,14 +41,20 @@ void display::OBS_content_createDisplay(const v8::FunctionCallbackInfo<v8::Value
 	FixChromeD3DIssue((HWND)windowHandle);
 
 	std::string key;
+	uint32_t width, height, positionX, positionY;
 	ASSERT_GET_VALUE(args[1], key);
+	ASSERT_GET_VALUE(args[2], width);
+	ASSERT_GET_VALUE(args[3], height);
+	ASSERT_GET_VALUE(args[4], positionX);
+	ASSERT_GET_VALUE(args[5], positionY);
 
 	auto conn = GetConnection();
 	if (!conn) return;
 
 	std::vector<ipc::value> response =
 		conn->call_synchronous_helper("Display", "OBS_content_createDisplay",
-		{ ipc::value(windowHandle), ipc::value(key) });
+		{ ipc::value(windowHandle), ipc::value(key),
+			ipc::value(width), ipc::value(height), ipc::value(positionX), ipc::value(positionY) });
 
 	ValidateResponse(response);
 }
@@ -127,15 +133,21 @@ void display::OBS_content_createSourcePreviewDisplay(const v8::FunctionCallbackI
 	FixChromeD3DIssue((HWND)windowHandle);
 
 	std::string sourceName, key;
+	uint32_t width, height, positionX, positionY;
 	ASSERT_GET_VALUE(args[1], sourceName);
 	ASSERT_GET_VALUE(args[2], key);
+	ASSERT_GET_VALUE(args[3], width);
+	ASSERT_GET_VALUE(args[4], height);
+	ASSERT_GET_VALUE(args[5], positionX);
+	ASSERT_GET_VALUE(args[6], positionY);
 
 	auto conn = GetConnection();
 	if (!conn) return;
 
 	std::vector<ipc::value> response =
 		conn->call_synchronous_helper("Display", "OBS_content_createSourcePreviewDisplay", 
-		{ ipc::value(windowHandle), ipc::value(sourceName), ipc::value(key) });
+		{ ipc::value(windowHandle), ipc::value(sourceName), ipc::value(key),
+			ipc::value(width), ipc::value(height), ipc::value(positionX), ipc::value(positionY) });
 
 	ValidateResponse(response);
 }

obs-studio-server/source/nodeobs_common.cpp

@@ -109,7 +109,8 @@ void OBS_content::Register(ipc::server& srv) {
 	std::shared_ptr<ipc::collection> cls = std::make_shared<ipc::collection>("Display");
 
 	cls->register_function(std::make_shared<ipc::function>("OBS_content_createDisplay", 
-		std::vector<ipc::type>{ipc::type::UInt64, ipc::type::String}, OBS_content_createDisplay));
+		std::vector<ipc::type>{ipc::type::UInt64, ipc::type::String, ipc::type::UInt32, ipc::type::UInt32,
+		ipc::type::UInt32, ipc::type::UInt32}, OBS_content_createDisplay));
 
 	cls->register_function(std::make_shared<ipc::function>("OBS_content_destroyDisplay", 
 		std::vector<ipc::type>{ipc::type::String}, OBS_content_destroyDisplay));
@@ -121,7 +122,9 @@ void OBS_content::Register(ipc::server& srv) {
 		std::vector<ipc::type>{ipc::type::String}, OBS_content_getDisplayPreviewSize));
 
 	cls->register_function(std::make_shared<ipc::function>("OBS_content_createSourcePreviewDisplay",
-		std::vector<ipc::type>{ipc::type::UInt64, ipc::type::String, ipc::type::String}, OBS_content_createSourcePreviewDisplay));
+		std::vector<ipc::type>{ipc::type::UInt64, ipc::type::String, ipc::type::String,
+		ipc::type::UInt32, ipc::type::UInt32, ipc::type::UInt32, ipc::type::UInt32}, 
+		OBS_content_createSourcePreviewDisplay));
 
 	cls->register_function(std::make_shared<ipc::function>("OBS_content_resizeDisplay",
 		std::vector<ipc::type>{ipc::type::String, ipc::type::UInt32, ipc::type::UInt32}, OBS_content_resizeDisplay));
@@ -185,7 +188,9 @@ void OBS_content::OBS_content_createDisplay(void* data, const int64_t id, const
 		return;
 	}
 
-	displays.insert_or_assign(args[1].value_str, new OBS::Display(windowHandle));
+	displays.insert_or_assign(args[1].value_str, new OBS::Display(windowHandle, 
+		args[2].value_union.ui32, args[3].value_union.ui32,
+		args[4].value_union.ui32, args[5].value_union.ui32));
 	rval.push_back(ipc::value((uint64_t)ErrorCode::Ok));
 	AUTO_DEBUG;
 }
@@ -217,7 +222,9 @@ void OBS_content::OBS_content_createSourcePreviewDisplay(void* data, const int64
 		std::cout << "Duplicate key provided to createDisplay!" << std::endl;
 		return;
 	}
-	displays.insert_or_assign(args[2].value_str, new OBS::Display(windowHandle, args[1].value_str));
+	displays.insert_or_assign(args[2].value_str, new OBS::Display(windowHandle, args[3].value_union.ui32,
+		args[4].value_union.ui32, args[5].value_union.ui32,
+		args[6].value_union.ui32, args[1].value_str));
 	rval.push_back(ipc::value((uint64_t)ErrorCode::Ok));
 	AUTO_DEBUG;
 }

obs-studio-server/source/nodeobs_display.cpp

@@ -256,7 +256,8 @@ OBS::Display::Display() {
 	m_drawGuideLines = true;
 }
 
-OBS::Display::Display(uint64_t windowHandle) : Display() {
+OBS::Display::Display(uint64_t windowHandle, 
+	uint32_t width, uint32_t height, uint32_t positionX, uint32_t positionY) : Display() {
 #ifdef _WIN32
 	CreateWindowMessageQuestion question;
 	CreateWindowMessageAnswer answer;
@@ -291,9 +292,13 @@ OBS::Display::Display(uint64_t windowHandle) : Display() {
 
 	obs_display_add_draw_callback(m_display, DisplayCallback, this);
 	obs_display_set_background_color(m_display, 0x0);
+
+	SetSize(width, height);
+	SetPosition(positionX, positionY);
 }
 
-OBS::Display::Display(uint64_t windowHandle, std::string sourceName) : Display(windowHandle) {
+OBS::Display::Display(uint64_t windowHandle, uint32_t width, uint32_t height, uint32_t positionX, uint32_t positionY, 
+	std::string sourceName) : Display(windowHandle, width, height, positionX, positionY) {
 	std::cout << "creating display" << std::endl;
 	m_source = obs_get_source_by_name(sourceName.c_str());
 	obs_source_inc_showing(m_source);

obs-studio-server/source/nodeobs_display.h

@@ -33,8 +33,10 @@ namespace OBS {
 		Display();
 
 		public:
-		Display(uint64_t windowHandle); // Create a Main Preview one
-		Display(uint64_t windowHandle, std::string sourceName); // Create a Source-Specific one
+		Display(uint64_t windowHandle, uint32_t width, uint32_t height,
+			uint32_t positionX, uint32_t positionY); // Create a Main Preview one
+		Display(uint64_t windowHandle, uint32_t width, uint32_t height,
+			uint32_t positionX, uint32_t positionY, std::string sourceName); // Create a Source-Specific one
 		~Display();
 #pragma endregion Constructors & Finalizer