Pass obs_data_t config to PTZDevice constructor

Instead of only passing the type, pass the whole obs_data_t structure through to the base class constructor so that it can access any of the configuration items it needs. Signed-off-by: Grant Likely <[email protected]>
glikely · Oct 25, 2021 · 2266907 · 2266907
1 parent bd397f4
commit 2266907
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/ptz-device.hpp b/ptz-device.hpp
@@ -75,8 +75,9 @@ class PTZDevice : public QObject {
 	void settingsChanged(OBSData settings);
 
 public:
-	PTZDevice(std::string type) : QObject(), type(type)
+	PTZDevice(OBSData config) : QObject()
 	{
+		type = obs_data_get_string(config, "type");
 		settings = obs_data_create();
 		obs_data_release(settings);
 		ptzDeviceList.add(this);

diff --git a/ptz-pelco.cpp b/ptz-pelco.cpp
@@ -133,7 +133,7 @@ void PTZPelco::zoom_speed_set(double speed)
 }
 
 PTZPelco::PTZPelco(OBSData data)
-	: PTZDevice("pelco"), iface(NULL)
+	: PTZDevice(data), iface(NULL)
 {
 	set_config(data);
 	ptz_debug("pelco device created");

diff --git a/ptz-visca.cpp b/ptz-visca.cpp
@@ -463,8 +463,8 @@ const QMap<int, std::string> PTZVisca::viscaModels = {
 /*
  * PTZVisca Methods
  */
-PTZVisca::PTZVisca(std::string type)
-	: PTZDevice(type)
+PTZVisca::PTZVisca(OBSData config)
+	: PTZDevice(config)
 {
 	for (int i = 0; i < 8; i++)
 		active_cmd[i] = false;
@@ -807,7 +807,7 @@ ViscaUART * ViscaUART::get_interface(QString port_name)
 }
 
 PTZViscaSerial::PTZViscaSerial(OBSData config)
-	: PTZVisca("visca"), iface(NULL)
+	: PTZVisca(config), iface(NULL)
 {
 	set_config(config);
 	auto_settings_filter += {"port", "address", "baud_rate"};
@@ -945,7 +945,7 @@ ViscaUDPSocket * ViscaUDPSocket::get_interface(int port)
 }
 
 PTZViscaOverIP::PTZViscaOverIP(OBSData config)
-	: PTZVisca("visca-over-ip"), iface(NULL)
+	: PTZVisca(config), iface(NULL)
 {
 	address = 1;
 	set_config(config);
@@ -1026,7 +1026,7 @@ obs_properties_t *PTZViscaOverIP::get_obs_properties()
  * VISCA over TCP implementation (e.g., PTZOptics cameras
  */
 PTZViscaOverTCP::PTZViscaOverTCP(OBSData config)
-	: PTZVisca("visca-over-tcp")
+	: PTZVisca(config)
 {
 	address = 1;
 	set_config(config);

diff --git a/ptz-visca.hpp b/ptz-visca.hpp
@@ -40,7 +40,7 @@ protected slots:
 	void receive(const QByteArray &msg);
 
 public:
-	PTZVisca(std::string type);
+	PTZVisca(OBSData config);
 	obs_properties_t *get_obs_properties();
 
 	virtual void set_config(OBSData ptz_data) = 0;