From aa57c471790bf038e2bfe4a287b8754b0bd19fc5 Mon Sep 17 00:00:00 2001 From: derrod Date: Sat, 25 Jan 2025 19:27:33 +0100 Subject: [PATCH] frontend: Remove channel change signal handler from transform dialog --- frontend/dialogs/OBSBasicTransform.cpp | 19 ------------------- frontend/dialogs/OBSBasicTransform.hpp | 3 --- 2 files changed, 22 deletions(-) diff --git a/frontend/dialogs/OBSBasicTransform.cpp b/frontend/dialogs/OBSBasicTransform.cpp index 7889f84bce1321..bbf94b5a3a984b 100644 --- a/frontend/dialogs/OBSBasicTransform.cpp +++ b/frontend/dialogs/OBSBasicTransform.cpp @@ -77,8 +77,6 @@ OBSBasicTransform::OBSBasicTransform(OBSSceneItem item, OBSBasic *parent) OBSDataAutoRelease wrapper = obs_scene_save_transform_states(main->GetCurrentScene(), false); undo_data = std::string(obs_data_get_json(wrapper)); - - channelChangedSignal.Connect(obs_get_signal_handler(), "channel_change", OBSChannelChanged, this); } OBSBasicTransform::~OBSBasicTransform() @@ -136,23 +134,6 @@ void OBSBasicTransform::SetItemQt(OBSSceneItem newItem) SetEnabled(enable); } -void OBSBasicTransform::OBSChannelChanged(void *param, calldata_t *data) -{ - OBSBasicTransform *window = reinterpret_cast(param); - uint32_t channel = (uint32_t)calldata_int(data, "channel"); - OBSSource source = (obs_source_t *)calldata_ptr(data, "source"); - - if (channel == 0) { - OBSScene scene = obs_scene_from_source(source); - window->SetScene(scene); - - if (!scene) - window->SetItem(nullptr); - else - window->SetItem(FindASelectedItem(scene)); - } -} - void OBSBasicTransform::OBSSceneItemTransform(void *param, calldata_t *data) { OBSBasicTransform *window = reinterpret_cast(param); diff --git a/frontend/dialogs/OBSBasicTransform.hpp b/frontend/dialogs/OBSBasicTransform.hpp index d1559e18ba9f54..22acfe8c5fb834 100644 --- a/frontend/dialogs/OBSBasicTransform.hpp +++ b/frontend/dialogs/OBSBasicTransform.hpp @@ -17,7 +17,6 @@ class OBSBasicTransform : public QDialog { OBSBasic *main; OBSSceneItem item; - OBSSignal channelChangedSignal; std::vector sigs; std::string undo_data; @@ -35,8 +34,6 @@ class OBSBasicTransform : public QDialog { void SetScene(OBSScene scene); void SetItem(OBSSceneItem newItem); - static void OBSChannelChanged(void *param, calldata_t *data); - static void OBSSceneItemTransform(void *param, calldata_t *data); static void OBSSceneItemRemoved(void *param, calldata_t *data); static void OBSSceneItemSelect(void *param, calldata_t *data);