From a0a272f49e90e8725a01ba037f9d2cc63b378774 Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Sun, 11 Oct 2020 20:02:37 +0200 Subject: [PATCH] fix include path and warning --- src/advanced-scene-switcher.cpp | 2 +- src/headers/switch-audio.hpp | 10 +++++----- src/switch-audio.cpp | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/advanced-scene-switcher.cpp b/src/advanced-scene-switcher.cpp index 6e03c028..c707836d 100644 --- a/src/advanced-scene-switcher.cpp +++ b/src/advanced-scene-switcher.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/headers/switch-audio.hpp b/src/headers/switch-audio.hpp index e8194754..25562569 100644 --- a/src/headers/switch-audio.hpp +++ b/src/headers/switch-audio.hpp @@ -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); diff --git a/src/switch-audio.cpp b/src/switch-audio.cpp index 859c6989..d202af81 100644 --- a/src/switch-audio.cpp +++ b/src/switch-audio.cpp @@ -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);