UI: Cleanup libobs C++ type use

This commit is contained in:
VodBox
2021-11-26 22:25:39 +13:00
parent a8c30373d6
commit 3d544653e8
31 changed files with 538 additions and 992 deletions

View File

@@ -77,29 +77,26 @@ OBSBasicTransform::OBSBasicTransform(OBSBasic *parent)
std::string name = obs_source_get_name(obs_sceneitem_get_source(item));
setWindowTitle(QTStr("Basic.TransformWindow.Title").arg(name.c_str()));
obs_data_t *wrapper =
OBSDataAutoRelease wrapper =
obs_scene_save_transform_states(main->GetCurrentScene(), false);
undo_data = std::string(obs_data_get_json(wrapper));
obs_data_release(wrapper);
channelChangedSignal.Connect(obs_get_signal_handler(), "channel_change",
OBSChannelChanged, this);
}
OBSBasicTransform::~OBSBasicTransform()
{
obs_data_t *wrapper =
OBSDataAutoRelease wrapper =
obs_scene_save_transform_states(main->GetCurrentScene(), false);
auto undo_redo = [](const std::string &data) {
obs_data_t *dat = obs_data_create_from_json(data.c_str());
obs_source_t *source = obs_get_source_by_name(
OBSDataAutoRelease dat =
obs_data_create_from_json(data.c_str());
OBSSourceAutoRelease source = obs_get_source_by_name(
obs_data_get_string(dat, "scene_name"));
reinterpret_cast<OBSBasic *>(App()->GetMainWindow())
->SetCurrentScene(source, true);
obs_source_release(source);
obs_data_release(dat);
->SetCurrentScene(source.Get(), true);
obs_scene_load_transform_states(data.c_str());
};
@@ -110,8 +107,6 @@ OBSBasicTransform::~OBSBasicTransform()
.arg(obs_source_get_name(obs_scene_get_source(
main->GetCurrentScene()))),
undo_redo, undo_redo, undo_data, redo_data);
obs_data_release(wrapper);
}
void OBSBasicTransform::SetScene(OBSScene scene)