mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-04-13 02:59:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

UI: Cleanup libobs C++ type use

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

24
UI/window-basic-preview.cpp
View File

@@ -32,9 +32,6 @@ OBSBasicPreview::~OBSBasicPreview()
gs_vertexbuffer_destroy(rectFill);
obs_leave_graphics();
if (wrapper)
obs_data_release(wrapper);
}
vec2 OBSBasicPreview::GetMouseEventPos(QMouseEvent *event)
@@ -568,8 +565,6 @@ void OBSBasicPreview::mousePressEvent(QMouseEvent *event)
vec2_zero(&lastMoveOffset);
mousePos = startPos;
if (wrapper)
obs_data_release(wrapper);
wrapper =
obs_scene_save_transform_states(main->GetCurrentScene(), true);
changed = false;
@@ -706,17 +701,16 @@ void OBSBasicPreview::mouseReleaseEvent(QMouseEvent *event)
selectedItems.clear();
}
OBSBasic *main = reinterpret_cast<OBSBasic *>(App()->GetMainWindow());
obs_data_t *rwrapper =
OBSDataAutoRelease rwrapper =
obs_scene_save_transform_states(main->GetCurrentScene(), true);
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());
};
@@ -732,13 +726,7 @@ void OBSBasicPreview::mouseReleaseEvent(QMouseEvent *event)
undo_redo, undo_redo, undo_data, redo_data);
}
if (wrapper)
obs_data_release(wrapper);
if (rwrapper)
obs_data_release(rwrapper);
wrapper = NULL;
wrapper = nullptr;
}
struct SelectedItemBounds {