Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

frontend: Remove channel change signal handler from transform dialog #11769

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+0 −22
Open

frontend: Remove channel change signal handler from transform dialog #11769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions frontend/dialogs/OBSBasicTransform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -136,23 +134,6 @@ void OBSBasicTransform::SetItemQt(OBSSceneItem newItem)
SetEnabled(enable);
}

void OBSBasicTransform::OBSChannelChanged(void *param, calldata_t *data)
{
OBSBasicTransform *window = reinterpret_cast<OBSBasicTransform *>(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<OBSBasicTransform *>(param);
Expand Down
3 changes: 0 additions & 3 deletions frontend/dialogs/OBSBasicTransform.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ class OBSBasicTransform : public QDialog {

OBSBasic *main;
OBSSceneItem item;
OBSSignal channelChangedSignal;
std::vector<OBSSignal> sigs;

std::string undo_data;
Expand All @@ -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);
Expand Down
Loading