Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-09-08 17:45:57 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Cleanup

Browse Source 
* Fix warnings
 * Remove unused includes
 * Fix build issue if libremidi CMakeLists.txt does not exist
This commit is contained in:
WarmUpTill
2023-08-12 13:59:15 +02:00
committed by WarmUpTill
parent 3f51f63298
commit 1a8c894ddf
13 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/utils/item-selection-helpers.hpp
View File

@@ -4,16 +4,10 @@
#include <QPushButton>
#include <QDialog>
#include <QLineEdit>
#include <QCheckBox>
#include <QSpinBox>
#include <QLabel>
#include <QDialogButtonBox>
#include <QSpinBox>
#include <QTimer>
#include <QWidget>
#include <deque>
#include <obs.hpp>
#include <websocket-helpers.hpp>
#include <obs-data.h>
namespace advss {

8
src/utils/osc-helpers.cpp
View File

@@ -5,6 +5,12 @@
#include <string.h>
#include <QGroupBox>
#ifdef WIN32
#include <winsock.h>
#else
#include <arpa/inet.h>
#endif
namespace advss {
std::unordered_map<size_t, OSCMessageElement::TypeInfo>
@@ -360,7 +366,7 @@ OSCMessageElementEdit::OSCMessageElementEdit(QWidget *parent)
_text->hide();
_binaryText->hide();
for (int i = 0; i < OSCMessageElement::_typeNames.size() - 1; i++) {
for (size_t i = 0; i < OSCMessageElement::_typeNames.size() - 1; i++) {
_type->addItem(obs_module_text(
OSCMessageElement::_typeNames.at(i).localizedName));
}

5
src/utils/scene-item-selection.cpp
View File

@@ -367,7 +367,6 @@ std::vector<OBSSceneItem> SceneItemSelection::GetSceneItemsByName(
} else {
name = GetWeakSourceName(_source);
}
int count = getCountOfSceneItemOccurance(sceneSelection, name, false);
auto items = getSceneItemsWithName(scene, name);
ReduceBadedOnIndexSelection(items);
return items;
@@ -754,6 +753,10 @@ void SceneItemSelectionWidget::SetNameConflictVisibility()
sceneItemCount =
getTotalSceneItemCountOnScene(_scene.GetScene(false));
break;
case SceneItemSelection::Type::INDEX:
case SceneItemSelection::Type::INDEX_RANGE:
case SceneItemSelection::Type::ALL:
break;
}
if (_currentSelection._type ==

1
src/utils/string-list.cpp
View File

@@ -3,6 +3,7 @@
#include "utility.hpp"
#include <QLayout>
#include <QTimer>
namespace advss {

4
src/utils/utility.cpp
View File

@@ -605,11 +605,11 @@ bool IsValidMacroSegmentIndex(Macro *m, const int idx, bool isCondition)
return false;
}
if (isCondition) {
if (idx >= m->Conditions().size()) {
if (idx >= (int)m->Conditions().size()) {
return false;
}
} else {
if (idx >= m->Actions().size()) {
if (idx >= (int)m->Actions().size()) {
return false;
}
}