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(ReorderSceneItems): refactor

Browse Source
This commit is contained in:
Stéphane Lepin 2019-08-31 01:33:33 +02:00
parent 71f792944c
commit dca385ae87
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/WSRequestHandler_Scenes.cpp
View File

@ -94,8 +94,8 @@ HandlerResponse WSRequestHandler::HandleGetSceneList(WSRequestHandler* req) {
*/ */
HandlerResponse WSRequestHandler::HandleReorderSceneItems(WSRequestHandler* req) { HandlerResponse WSRequestHandler::HandleReorderSceneItems(WSRequestHandler* req) {
QString sceneName = obs_data_get_string(req->data, "scene"); QString sceneName = obs_data_get_string(req->data, "scene");
OBSSourceAutoRelease scene = Utils::GetSceneFromNameOrCurrent(sceneName); OBSSourceAutoRelease sceneSource = Utils::GetSceneFromNameOrCurrent(sceneName);
if (!scene) { if (!sceneSource) {
return req->SendErrorResponse("requested scene doesn't exist"); return req->SendErrorResponse("requested scene doesn't exist");
} }
@ -104,38 +104,29 @@ HandlerResponse WSRequestHandler::HandleReorderSceneItems(WSRequestHandler* req)
return req->SendErrorResponse("sceneItem order not specified"); return req->SendErrorResponse("sceneItem order not specified");
} }
size_t count = obs_data_array_count(items); OBSScene scene = obs_scene_from_source(sceneSource);
std::vector<obs_sceneitem_t*> newOrder; QVector<struct obs_sceneitem_order_info> orderList;
newOrder.reserve(count); struct obs_sceneitem_order_info info;
for (size_t i = 0; i < count; ++i) { size_t itemCount = obs_data_array_count(items);
for (int i = 0; i < itemCount; i++) {
OBSDataAutoRelease item = obs_data_array_item(items, i); OBSDataAutoRelease item = obs_data_array_item(items, i);
OBSSceneItemAutoRelease sceneItem = Utils::GetSceneItemFromItem(scene, item); OBSSceneItemAutoRelease sceneItem = Utils::GetSceneItemFromItem(sceneSource, item);
obs_sceneitem_release(sceneItem); // ref dec
if (!sceneItem) { if (!sceneItem) {
return req->SendErrorResponse("Invalid sceneItem id or name specified"); return req->SendErrorResponse("Invalid sceneItem id or name specified");
} }
for (size_t j = 0; j <= i; ++j) {
if (sceneItem == newOrder[j]) {
return req->SendErrorResponse("Duplicate sceneItem in specified order");
}
}
newOrder.push_back(sceneItem); info.group = nullptr;
info.item = sceneItem;
orderList.insert(0, info);
} }
bool success = obs_scene_reorder_items(obs_scene_from_source(scene), newOrder.data(), count); bool success = obs_scene_reorder_items2(scene, orderList.data(), orderList.size());
if (!success) { if (!success) {
return req->SendErrorResponse("Invalid sceneItem order"); return req->SendErrorResponse("Invalid sceneItem order");
} }
for (auto const& item: newOrder) {
obs_sceneitem_release(item);
}
return req->SendOKResponse(); return req->SendOKResponse();
} }