diff options
| -rw-r--r-- | .github/workflows/ci.yml | 6 | ||||
| -rw-r--r-- | ci/msys-deps.txt | 2 | ||||
| -rw-r--r-- | src/discord/snowflake.hpp | 2 | ||||
| -rw-r--r-- | src/util.hpp | 2 | ||||
| -rw-r--r-- | src/windows/voice/voicewindow.cpp | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cdfa8f3..a3ef6a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -122,7 +122,7 @@ jobs: if_false: "${{ matrix.buildtype }}" - name: Upload build (2) - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: build-windows-msys2-${{ steps.buildname.outputs.value }} path: build/artifactdir @@ -167,7 +167,7 @@ jobs: cp -r "${{ github.workspace }}/res/res" "${artifact_dir}/res" - name: Upload build - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: build-macos-${{ matrix.buildtype }} path: build/artifactdir @@ -225,7 +225,7 @@ jobs: cp -r "${{ github.workspace }}/res/res" "${artifact_dir}/res" - name: Upload build - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: build-linux-${{ matrix.buildtype }} path: ${{ runner.workspace }}/artifactdir diff --git a/ci/msys-deps.txt b/ci/msys-deps.txt index 56fc676..071d288 100644 --- a/ci/msys-deps.txt +++ b/ci/msys-deps.txt @@ -15,7 +15,7 @@ /bin/libepoxy-0.dll /bin/libexpat-1.dll /bin/libffi-8.dll -/bin/libfmt.dll +/bin/libfmt-11.dll /bin/libfontconfig-1.dll /bin/libfreetype-6.dll /bin/libfribidi-0.dll diff --git a/src/discord/snowflake.hpp b/src/discord/snowflake.hpp index 68cb5ea..2208f29 100644 --- a/src/discord/snowflake.hpp +++ b/src/discord/snowflake.hpp @@ -44,7 +44,7 @@ private: template<> struct fmt::formatter<Snowflake> : fmt::formatter<std::string> { - auto format(Snowflake id, format_context &ctx) -> decltype(ctx.out()) { + auto format(Snowflake id, format_context &ctx) const -> decltype(ctx.out()) { return format_to(ctx.out(), "[id: {}]", static_cast<uint64_t>(id)); } }; diff --git a/src/util.hpp b/src/util.hpp index 4024e34..072a8e2 100644 --- a/src/util.hpp +++ b/src/util.hpp @@ -11,7 +11,7 @@ #include <regex> #include <mutex> #include <condition_variable> -#include <glibconfig.h> +#include <glib.h> #include <optional> #include <type_traits> diff --git a/src/windows/voice/voicewindow.cpp b/src/windows/voice/voicewindow.cpp index e59705a..a9e9682 100644 --- a/src/windows/voice/voicewindow.cpp +++ b/src/windows/voice/voicewindow.cpp @@ -115,10 +115,12 @@ VoiceWindow::VoiceWindow(Snowflake channel_id) UpdateVADParamValue(); }); +#ifdef WITH_RNNOISE m_noise_suppression.set_active(audio.GetSuppressNoise()); m_noise_suppression.signal_toggled().connect([this]() { Abaddon::Get().GetAudio().SetSuppressNoise(m_noise_suppression.get_active()); }); +#endif m_mix_mono.set_active(audio.GetMixMono()); m_mix_mono.signal_toggled().connect([this]() { |