mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-05-12 01:06:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

frontend: Auto release OBSDataArray objects

Browse Source 
Makes sure that all obs data array objects in cpp files are using
auto release RAII wrappers.
This commit is contained in:
cg2121
2025-05-31 21:03:32 -05:00
committed by Ryan Foster
parent 91e90817d2
commit 33e8a23386
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/utility/GoLiveAPI_CensoredJson.cpp
View File

@@ -25,9 +25,8 @@ void censorRecurse(obs_data_t *data)
censorRecurse(child_data);
obs_data_release(child_data);
} else if (typ == OBS_DATA_ARRAY) {
obs_data_array_t *child_array = obs_data_item_get_array(item);
OBSDataArrayAutoRelease child_array = obs_data_item_get_array(item);
censorRecurseArray(child_array);
obs_data_array_release(child_array);
}
}
}

10
frontend/widgets/OBSBasic_SceneCollections.cpp
View File

@@ -834,7 +834,7 @@ static obs_data_t *GenerateSaveData(obs_data_array_t *sceneOrder, obs_data_array
};
using FilterAudioSources_t = decltype(FilterAudioSources);
obs_data_array_t *sourcesArray = obs_save_sources_filtered(
OBSDataArrayAutoRelease sourcesArray = obs_save_sources_filtered(
[](void *data, obs_source_t *source) {
auto &func = *static_cast<FilterAudioSources_t *>(data);
return func(source);
@@ -845,7 +845,7 @@ static obs_data_t *GenerateSaveData(obs_data_array_t *sceneOrder, obs_data_array
/* save group sources separately */
/* saving separately ensures they won't be loaded in older versions */
obs_data_array_t *groupsArray = obs_save_sources_filtered(
OBSDataArrayAutoRelease groupsArray = obs_save_sources_filtered(
[](void *, obs_source_t *source) { return obs_source_is_group(source); }, nullptr);
/* -------------------------------- */
@@ -861,14 +861,12 @@ static obs_data_t *GenerateSaveData(obs_data_array_t *sceneOrder, obs_data_array
obs_data_set_string(saveData, "current_program_scene", programName);
obs_data_set_array(saveData, "scene_order", sceneOrder);
obs_data_set_string(saveData, "name", sceneCollection);
obs_data_set_array(saveData, "sources", sourcesArray);
obs_data_set_array(saveData, "groups", groupsArray);
obs_data_set_array(saveData, "sources", sourcesArray.Get());
obs_data_set_array(saveData, "groups", groupsArray.Get());
obs_data_set_array(saveData, "quick_transitions", quickTransitionData);
obs_data_set_array(saveData, "transitions", transitions);
obs_data_set_array(saveData, "saved_projectors", savedProjectorList);
obs_data_set_array(saveData, "canvases", savedCanvases);
obs_data_array_release(sourcesArray);
obs_data_array_release(groupsArray);
obs_data_set_string(saveData, "current_transition", obs_source_get_name(transition));
obs_data_set_int(saveData, "transition_duration", transitionDuration);