jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Save virtual camera outside of the modules object

Browse Source 
Save the configuration outside of the modules object meant for plugins
in the scene collection.
This commit is contained in:
tytan652 2022-08-18 10:50:13 +02:00 committed by Jim
parent ccfe300f72
commit f41404528a
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UI/window-basic-main.cpp
View File

@ -729,6 +729,8 @@ void OBSBasic::Save(const char *file)
obs_data_set_double(saveData, "scaling_off_y", obs_data_set_double(saveData, "scaling_off_y",
ui->preview->GetScrollY()); ui->preview->GetScrollY());
OBSBasicVCamConfig::SaveData(saveData, true);
if (api) { if (api) {
OBSDataAutoRelease moduleObj = obs_data_create(); OBSDataAutoRelease moduleObj = obs_data_create();
api->on_save(moduleObj); api->on_save(moduleObj);
@ -1141,6 +1143,8 @@ retryScene:
ui->preview->SetFixedScaling(fixedScaling); ui->preview->SetFixedScaling(fixedScaling);
emit ui->preview->DisplayResized(); emit ui->preview->DisplayResized();
OBSBasicVCamConfig::SaveData(data, false);
/* ---------------------- */ /* ---------------------- */
if (api) if (api)

3
UI/window-basic-vcam-config.cpp
View File

@ -133,7 +133,7 @@ void OBSBasicVCamConfig::Save()
UpdateOutputSource(); UpdateOutputSource();
} }
static void SaveCallback(obs_data_t *data, bool saving, void *) void OBSBasicVCamConfig::SaveData(obs_data_t *data, bool saving)
{ {
if (saving) { if (saving) {
OBSDataAutoRelease obj = obs_data_create(); OBSDataAutoRelease obj = obs_data_create();
@ -189,7 +189,6 @@ void OBSBasicVCamConfig::Init()
vCamConfig = &staticConfig; vCamConfig = &staticConfig;
obs_frontend_add_save_callback(SaveCallback, nullptr);
obs_frontend_add_event_callback(EventCallback, nullptr); obs_frontend_add_event_callback(EventCallback, nullptr);
} }

1
UI/window-basic-vcam-config.hpp
View File

@ -17,6 +17,7 @@ public:
static void DestroyView(); static void DestroyView();
static void UpdateOutputSource(); static void UpdateOutputSource();
static void SaveData(obs_data_t *data, bool saving);
explicit OBSBasicVCamConfig(QWidget *parent = 0); explicit OBSBasicVCamConfig(QWidget *parent = 0);