Don't access PTZDevice* when scene changes

We don't want the UI directly accessing PTZDevice*, but when the active
scene changed, the front end was using PTZListModel::getDeviceByName()
which returns a PTZDevice* pointer. Solve this by implmenting
PTZListModel::indexFromName() which allows the frontend to find a
relevant entry without having to access the PTZDevice directly.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

Author: glikely

src/ptz-controls.cpp

@@ -103,23 +103,18 @@ void PTZControls::OBSFrontendEvent(enum obs_frontend_event event)
 	if (!scene)
 		return;
 
-	struct active_src_cb_data {
-		PTZDevice *ptz;
+	auto active_src_cb = [](obs_source_t *, obs_source_t *child, void *context_data) {
+		QModelIndex *index = static_cast<QModelIndex *>(context_data);
+		if (!index->isValid())
+			*index = ptzDeviceList.indexFromName(obs_source_get_name(child));
 	};
-	auto active_src_cb = [](obs_source_t *parent, obs_source_t *child, void *context_data) {
-		Q_UNUSED(parent);
-		struct active_src_cb_data *context = static_cast<struct active_src_cb_data *>(context_data);
-		if (!context->ptz)
-			context->ptz = ptzDeviceList.getDeviceByName(obs_source_get_name(child));
-	};
-	struct active_src_cb_data cb_data;
-	cb_data.ptz = ptzDeviceList.getDeviceByName(obs_source_get_name(scene));
-	if (!cb_data.ptz)
-		obs_source_enum_active_sources(scene, active_src_cb, &cb_data);
+	QModelIndex cb_index = ptzDeviceList.indexFromName(obs_source_get_name(scene));
+	if (!cb_index.isValid())
+		obs_source_enum_active_sources(scene, active_src_cb, &cb_index);
 	obs_source_release(scene);
 
-	if (cb_data.ptz)
-		setCurrent(cb_data.ptz->getId());
+	if (cb_index.isValid())
+		ui->cameraList->setCurrentIndex(cb_index);
 }
 
 /* Helper funciton for changing currently selected OBS scene */
@@ -855,13 +850,6 @@ void PTZControls::on_focusButton_onetouch_clicked()
 	callCamera("focus_onetouch");
 }
 
-void PTZControls::setCurrent(uint32_t device_id)
-{
-	if (device_id == ptzDeviceList.getDeviceId(ui->cameraList->currentIndex()))
-		return;
-	ui->cameraList->setCurrentIndex(ptzDeviceList.indexFromDeviceId(device_id));
-}
-
 void PTZControls::setAutofocusEnabled(bool autofocus_on)
 {
 	ui->focusButton_auto->setChecked(autofocus_on);

src/ptz-device.cpp

@@ -189,6 +189,16 @@ QModelIndex PTZListModel::indexFromDeviceId(uint32_t device_id)
 	return index(row, 0);
 }
 
+QModelIndex PTZListModel::indexFromName(const QString &name)
+{
+	for (auto key : devices.keys()) {
+		auto ptz = devices.value(key);
+		if (name == ptz->objectName())
+			return index(devices.keys().indexOf(key), 0);
+	}
+	return QModelIndex();
+}
+
 obs_data_array_t *PTZListModel::getConfigs()
 {
 	obs_data_array_t *configs = obs_data_array_create();

src/ptz-device.hpp

@@ -57,6 +57,7 @@ class PTZListModel : public QAbstractListModel {
 	bool callDevice(const QModelIndex &index, const char *method, calldata *cd);
 	bool callDevice(const char *method, calldata *cd);
 	QModelIndex indexFromDeviceId(uint32_t device_id);
+	QModelIndex indexFromName(const QString &name);
 	void renameDevice(QString new_name, QString prev_name);
 	obs_data_array_t *getConfigs();
 	void removeDevice(const QModelIndex &index);