opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-19 09:41:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

UI: Remove redundant code

Browse Source 
The UpdateSceneSelection function was doing the same thing as the
code in the SetCurrentScene function.
This commit is contained in:
Clayton Groeneveld
2021-03-07 22:53:08 -08:00
committed by Jim
parent a20b4c67eb
commit 753de748e5
3 changed files with 2 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/window-basic-main-transitions.cpp
-2
View File
@@ -752,8 +752,6 @@ void OBSBasic::SetCurrentScene(OBSSource scene, bool force)
}
}
UpdateSceneSelection(scene);
if (scene) {
bool userSwitched = (!force && !disableSaving);
blog(LOG_INFO, "%s to scene '%s'",
UI/window-basic-main.cpp
+2 -33
View File
@@ -2930,32 +2930,6 @@ void OBSBasic::AddSceneItem(OBSSceneItem item)
}
}
void OBSBasic::UpdateSceneSelection(OBSSource source)
{
if (source) {
obs_scene_t *scene = obs_scene_from_source(source);
const char *name = obs_source_get_name(source);
if (!scene)
return;
QList<QListWidgetItem *> items =
ui->scenes->findItems(QT_UTF8(name), Qt::MatchExactly);
if (items.count()) {
sceneChanging = true;
ui->scenes->setCurrentItem(items.first());
sceneChanging = false;
OBSScene curScene =
GetOBSRef<OBSScene>(ui->scenes->currentItem());
if (api && scene != curScene)
api->on_event(
OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED);
}
}
}
static void RenameListValues(QListWidget *listWidget, const QString &newName,
const QString &prevName)
{
@@ -4488,9 +4462,6 @@ void OBSBasic::on_scenes_currentItemChanged(QListWidgetItem *current,
{
obs_source_t *source = NULL;
if (sceneChanging)
return;
if (current) {
obs_scene_t *scene;
@@ -4730,18 +4701,16 @@ void OBSBasic::ChangeSceneIndex(bool relative, int offset, int invalidIdx)
if (idx == -1 || idx == invalidIdx)
return;
sceneChanging = true;
QListWidgetItem *item = ui->scenes->takeItem(idx);
if (!relative)
idx = 0;
ui->scenes->blockSignals(true);
ui->scenes->insertItem(idx + offset, item);
ui->scenes->setCurrentRow(idx + offset);
item->setSelected(true);
sceneChanging = false;
ui->scenes->blockSignals(false);
OBSProjector::UpdateMultiviewProjectors();
}
UI/window-basic-main.hpp
-2
View File
@@ -235,8 +235,6 @@ private:
gs_vertbuffer_t *boxBottom = nullptr;
gs_vertbuffer_t *circle = nullptr;
bool sceneChanging = false;
int previewX = 0, previewY = 0;
int previewCX = 0, previewCY = 0;
float previewScale = 0.0f;