Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

requests(CreateSource): simplified settings apply

Browse Source 
obs_source_update already does that internally
This commit is contained in:
Stéphane Lepin
2020-11-27 19:38:01 +01:00
parent e30dce8b21
commit eaf34f3c3a
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/WSRequestHandler_Sources.cpp
View File

@ -66,12 +66,8 @@ RpcResponse WSRequestHandler::CreateSource(const RpcRequest& request)
obs_source_set_enabled(newSource, true); obs_source_set_enabled(newSource, true);
if (request.hasField("sourceSettings")) { // We apply the settings after source creation because otherwise we get a bunch of memory leaks. if (request.hasField("sourceSettings")) { // We apply the settings after source creation because otherwise we get a bunch of memory leaks.
OBSDataAutoRelease currentSettings = obs_source_get_settings(newSource);
OBSDataAutoRelease newSettings = obs_data_get_obj(request.parameters(), "sourceSettings"); OBSDataAutoRelease newSettings = obs_data_get_obj(request.parameters(), "sourceSettings");
OBSDataAutoRelease sourceSettings = obs_data_create(); obs_source_update(newSource, newSettings);
obs_data_apply(sourceSettings, currentSettings);
obs_data_apply(sourceSettings, newSettings);
obs_source_update(newSource, sourceSettings);
obs_source_update_properties(newSource); obs_source_update_properties(newSource);
} }