mirror of
https://github.com/WarmUpTill/SceneSwitcher.git
synced 2026-06-14 12:51:43 -05:00
Fix warnings
This commit is contained in:
parent
69ab101ba3
commit
1785035b96
|
|
@ -5,8 +5,8 @@ struct MacroActionInfo {
|
|||
using TCreateMethod = std::shared_ptr<MacroAction> (*)();
|
||||
using TCreateWidgetMethod = QWidget *(*)(QWidget *parent,
|
||||
std::shared_ptr<MacroAction>);
|
||||
TCreateMethod _createFunc;
|
||||
TCreateWidgetMethod _createWidgetFunc;
|
||||
TCreateMethod _createFunc = nullptr;
|
||||
TCreateWidgetMethod _createWidgetFunc = nullptr;
|
||||
std::string _name;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@ public:
|
|||
|
||||
SceneSelection _scene;
|
||||
OBSWeakSource _source;
|
||||
struct obs_transform_info _info;
|
||||
struct obs_sceneitem_crop _crop;
|
||||
struct obs_transform_info _info = {};
|
||||
struct obs_sceneitem_crop _crop = {};
|
||||
|
||||
private:
|
||||
static bool _registered;
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ struct MacroConditionInfo {
|
|||
using TCreateMethod = std::shared_ptr<MacroCondition> (*)();
|
||||
using TCreateWidgetMethod =
|
||||
QWidget *(*)(QWidget *parent, std::shared_ptr<MacroCondition>);
|
||||
TCreateMethod _createFunc;
|
||||
TCreateWidgetMethod _createWidgetFunc;
|
||||
TCreateMethod _createFunc = nullptr;
|
||||
TCreateWidgetMethod _createWidgetFunc = nullptr;
|
||||
std::string _name;
|
||||
bool _useDurationConstraint = true;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ public:
|
|||
return std::make_shared<MacroConditionRecord>();
|
||||
}
|
||||
|
||||
RecordState _recordState;
|
||||
RecordState _recordState = RecordState::STOP;
|
||||
|
||||
private:
|
||||
static bool _registered;
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ public:
|
|||
return std::make_shared<MacroConditionReplayBuffer>();
|
||||
}
|
||||
|
||||
ReplayBufferState _state;
|
||||
ReplayBufferState _state = ReplayBufferState::STOP;
|
||||
|
||||
private:
|
||||
static bool _registered;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ public:
|
|||
bool _waitForTransition = true;
|
||||
|
||||
SceneSelection _scene;
|
||||
SceneType _type;
|
||||
SceneType _type = SceneType::CURRENT;
|
||||
|
||||
private:
|
||||
std::chrono::high_resolution_clock::time_point _lastSceneChangeTime{};
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ public:
|
|||
return std::make_shared<MacroConditionStream>();
|
||||
}
|
||||
|
||||
StreamState _streamState;
|
||||
StreamState _streamState = StreamState::STOP;
|
||||
|
||||
private:
|
||||
std::chrono::high_resolution_clock::time_point _lastStreamStartingTime{};
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ public:
|
|||
return std::make_shared<MacroConditionVCam>();
|
||||
}
|
||||
|
||||
VCamState _state;
|
||||
VCamState _state = VCamState::STOP;
|
||||
|
||||
private:
|
||||
static bool _registered;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ public:
|
|||
virtual std::string GetId() = 0;
|
||||
|
||||
protected:
|
||||
int _idx;
|
||||
int _idx = 0;
|
||||
bool _collapsed = false;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ public:
|
|||
void SetDuration(double seconds);
|
||||
|
||||
private:
|
||||
LogicType _logic;
|
||||
LogicType _logic = LogicType::ROOT_NONE;
|
||||
DurationConstraint _duration;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ struct AudioSwitch : virtual SceneSwitcherEntry {
|
|||
|
||||
AudioSwitch(){};
|
||||
AudioSwitch(const AudioSwitch &other);
|
||||
AudioSwitch(AudioSwitch &&other);
|
||||
AudioSwitch(AudioSwitch &&other) noexcept;
|
||||
~AudioSwitch();
|
||||
AudioSwitch &operator=(const AudioSwitch &other);
|
||||
AudioSwitch &operator=(AudioSwitch &&other) noexcept;
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ struct MediaSwitch : SceneSwitcherEntry {
|
|||
inline MediaSwitch(){};
|
||||
|
||||
MediaSwitch(const MediaSwitch &other);
|
||||
MediaSwitch(MediaSwitch &&other);
|
||||
MediaSwitch(MediaSwitch &&other) noexcept;
|
||||
~MediaSwitch();
|
||||
MediaSwitch &operator=(const MediaSwitch &other);
|
||||
MediaSwitch &operator=(MediaSwitch &&other) noexcept;
|
||||
|
|
|
|||
|
|
@ -70,8 +70,8 @@ private:
|
|||
QString getRemoteEndpoint(connection_hdl hdl);
|
||||
|
||||
server _server;
|
||||
quint16 _serverPort;
|
||||
bool _lockToIPv4;
|
||||
quint16 _serverPort = 55555;
|
||||
bool _lockToIPv4 = false;
|
||||
std::set<connection_hdl, std::owner_less<connection_hdl>> _connections;
|
||||
QMutex _clMutex;
|
||||
QThreadPool _threadPool;
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ struct SwitcherData {
|
|||
std::chrono::high_resolution_clock::time_point lastStreamStartingTime{};
|
||||
std::chrono::high_resolution_clock::time_point lastStreamStoppingTime{};
|
||||
OBSWeakSource lastRandomScene;
|
||||
SceneGroup *lastRandomSceneGroup;
|
||||
SceneGroup *lastRandomSceneGroup = nullptr;
|
||||
OBSWeakSource nonMatchingScene;
|
||||
NoMatch switchIfNotMatching = NO_SWITCH;
|
||||
Duration noMatchDelay;
|
||||
|
|
|
|||
|
|
@ -347,7 +347,7 @@ AudioSwitch::AudioSwitch(const AudioSwitch &other)
|
|||
volmeter = AddVolmeterToSource(this, other.audioSource);
|
||||
}
|
||||
|
||||
AudioSwitch::AudioSwitch(AudioSwitch &&other)
|
||||
AudioSwitch::AudioSwitch(AudioSwitch &&other) noexcept
|
||||
: SceneSwitcherEntry(other.targetType, other.group, other.scene,
|
||||
other.transition, other.usePreviousScene),
|
||||
audioSource(other.audioSource),
|
||||
|
|
|
|||
|
|
@ -342,7 +342,7 @@ MediaSwitch::MediaSwitch(const MediaSwitch &other)
|
|||
obs_source_release(mediasource);
|
||||
}
|
||||
|
||||
MediaSwitch::MediaSwitch(MediaSwitch &&other)
|
||||
MediaSwitch::MediaSwitch(MediaSwitch &&other) noexcept
|
||||
: SceneSwitcherEntry(other.targetType, other.group, other.scene,
|
||||
other.transition, other.usePreviousScene),
|
||||
source(other.source),
|
||||
|
|
|
|||
|
|
@ -217,7 +217,7 @@ void deleteLayoutItem(QLayoutItem *item)
|
|||
void clearLayout(QLayout *layout, int afterIdx)
|
||||
{
|
||||
QLayoutItem *item;
|
||||
while (item = layout->takeAt(afterIdx)) {
|
||||
while ((item = layout->takeAt(afterIdx))) {
|
||||
if (item->layout()) {
|
||||
clearLayout(item->layout());
|
||||
delete item->layout();
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user