fix include path and warning

This commit is contained in:
WarmUpTill
2020-10-11 20:02:37 +02:00
parent 5b315d0574
commit a0a272f49e
3 changed files with 10 additions and 10 deletions

View File

@@ -1,7 +1,7 @@
#include <QMainWindow>
#include <QDir>
#include <QAction>
#include <QtGui\qstandarditemmodel.h>
#include <QtGui/qstandarditemmodel.h>
#include <condition_variable>
#include <chrono>

View File

@@ -25,13 +25,13 @@ struct AudioSwitch : virtual SceneSwitcherEntry {
const float inputPeak[MAX_AUDIO_CHANNELS]);
void resetVolmeter();
inline AudioSwitch(){};
inline AudioSwitch(OBSWeakSource scene_, OBSWeakSource transition_,
OBSWeakSource audioSource_, int volumeThreshold_,
bool usePreviousScene_);
AudioSwitch(){};
AudioSwitch(OBSWeakSource scene_, OBSWeakSource transition_,
OBSWeakSource audioSource_, int volumeThreshold_,
bool usePreviousScene_);
AudioSwitch(const AudioSwitch &other);
AudioSwitch(AudioSwitch &&other);
inline ~AudioSwitch();
~AudioSwitch();
AudioSwitch &operator=(const AudioSwitch &other);
AudioSwitch &operator=(AudioSwitch &&other) noexcept;
friend void swap(AudioSwitch &first, AudioSwitch &second);

View File

@@ -232,9 +232,9 @@ bool AudioSwitch::valid()
return SceneSwitcherEntry::valid() && WeakSourceValid(audioSource);
}
inline AudioSwitch::AudioSwitch(OBSWeakSource scene_, OBSWeakSource transition_,
OBSWeakSource audioSource_,
int volumeThreshold_, bool usePreviousScene_)
AudioSwitch::AudioSwitch(OBSWeakSource scene_, OBSWeakSource transition_,
OBSWeakSource audioSource_, int volumeThreshold_,
bool usePreviousScene_)
: SceneSwitcherEntry(scene_, transition_, usePreviousScene_),
audioSource(audioSource_),
volumeThreshold(volumeThreshold_)
@@ -277,7 +277,7 @@ AudioSwitch::AudioSwitch(AudioSwitch &&other)
other.volmeter = nullptr;
}
inline AudioSwitch::~AudioSwitch()
AudioSwitch::~AudioSwitch()
{
obs_volmeter_remove_callback(volmeter, setVolumeLevel, this);
obs_volmeter_destroy(volmeter);