Fix includes, include audio sources only when needed

uowuo · Jun 11, 2024 · 9d5eb73 · 9d5eb73
1 parent bd45254
commit 9d5eb73
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 34 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,6 +49,14 @@ file(GLOB_RECURSE ABADDON_SOURCES
 list(FILTER ABADDON_SOURCES EXCLUDE REGEX ".*notifier_gio\\.cpp$")
 list(FILTER ABADDON_SOURCES EXCLUDE REGEX ".*notifier_fallback\\.cpp$")
 
+if (NOT ENABLE_VOICE)
+    list(FILTER ABADDON_SOURCES EXCLUDE REGEX "src/audio/voice/.*")
+endif ()
+
+if (NOT (ENABLE_VOICE OR ENABLE_NOTIFICATION_SOUNDS))
+    list(FILTER ABADDON_SOURCES EXCLUDE REGEX "src/audio/.*")
+endif ()
+
 add_executable(abaddon ${ABADDON_SOURCES})
 target_include_directories(abaddon PUBLIC ${PROJECT_SOURCE_DIR}/src)
 target_include_directories(abaddon PUBLIC ${PROJECT_BINARY_DIR})
@@ -216,3 +224,5 @@ set(ABADDON_COMPILER_DEFS "" CACHE STRING "Additional compiler definitions")
 foreach (COMPILER_DEF IN LISTS ABADDON_COMPILER_DEFS)
     target_compile_definitions(abaddon PRIVATE "${COMPILER_DEF}")
 endforeach ()
+
+set_property(TARGET abaddon PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
diff --git a/src/abaddon.cpp b/src/abaddon.cpp
@@ -7,7 +7,6 @@
 #include <algorithm>
 #include <gtkmm.h>
 #include "platform.hpp"
-#include "audio/manager.hpp"
 #include "discord/discord.hpp"
 #include "dialogs/token.hpp"
 #include "dialogs/confirm.hpp"
@@ -50,11 +49,15 @@ void macOSThemeChangedCallback(CFNotificationCenterRef center, void *observer, C
 #pragma comment(lib, "crypt32.lib")
 #endif
 
+#ifdef WITH_MINIAUDIO
+#include "audio/manager.hpp"
+#endif
+
 Abaddon::Abaddon()
     : m_settings(Platform::FindConfigFile())
     , m_discord(GetSettings().UseMemoryDB) // stupid but easy
     , m_emojis(GetResPath("/emojis.db"))
-#ifdef WITH_VOICE
+#ifdef WITH_MINIAUDIO
     , m_audio(GetSettings().Backends, m_discord)
 #endif
 {

diff --git a/src/abaddon.hpp b/src/abaddon.hpp
@@ -12,12 +12,13 @@
 #include "imgmanager.hpp"
 #include "emojis.hpp"
 #include "notifications/notifications.hpp"
+
+#ifdef WITH_MINIAUDIO
 #include "audio/manager.hpp"
+#endif
 
 #define APP_TITLE "Abaddon"
 
-class AudioManager;
-
 class Abaddon {
 private:
     Abaddon();
@@ -72,7 +73,7 @@ class Abaddon {
     ImageManager &GetImageManager();
     EmojiResource &GetEmojis();
 
-#ifdef WITH_VOICE
+#ifdef WITH_MINIAUDIO
     AudioManager &GetAudio();
 #endif
 
@@ -174,8 +175,11 @@ class Abaddon {
     ImageManager m_img_mgr;
     EmojiResource m_emojis;
 
-#ifdef WITH_VOICE
+#ifdef WITH_MINIAUDIO
     AudioManager m_audio;
+#endif
+
+#ifdef WITH_VOICE
     Gtk::Window *m_voice_window = nullptr;
 #endif
 

diff --git a/src/audio/devices.cpp b/src/audio/devices.cpp
@@ -1,5 +1,3 @@
-#ifdef WITH_VOICE
-
 // clang-format off
 
 #include "devices.hpp"
@@ -118,4 +116,3 @@ AudioDevices::CaptureColumns::CaptureColumns() {
     add(Name);
     add(DeviceID);
 }
-#endif
diff --git a/src/audio/devices.hpp b/src/audio/devices.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#ifdef WITH_MINIAUDIO
 
 // clang-format off
 
@@ -58,4 +57,3 @@ class AudioDevices {
     Gtk::TreeModel::iterator m_active_capture_iter;
     Gtk::TreeModel::iterator m_default_capture_iter;
 };
-#endif
diff --git a/src/audio/manager.cpp b/src/audio/manager.cpp
@@ -1,18 +1,4 @@
-#ifdef WITH_MINIAUDIO
-// clang-format off
-
-#ifdef _WIN32
-    #include <winsock2.h>
-#endif
-
 #include "manager.hpp"
-#include "abaddon.hpp"
-#include <glibmm/main.h>
-#include <spdlog/sinks/stdout_color_sinks.h>
-#include <miniaudio.h>
-#include <opus.h>
-#include <cstring>
-// clang-format on
 
 void mgr_log_callback(void *pUserData, ma_uint32 level, const char *pMessage) {
     auto *log = static_cast<spdlog::logger *>(pUserData);
@@ -151,5 +137,3 @@ const AbaddonClient::Audio::VoiceAudio& AudioManager::GetVoice() const noexcept
 }
 
 #endif
-
-#endif
diff --git a/src/audio/manager.hpp b/src/audio/manager.hpp
@@ -1,16 +1,14 @@
 #pragma once
-#ifdef WITH_MINIAUDIO
+
 // clang-format off
 
-#include <gtkmm/treemodel.h>
-#include <vector>
-#include <miniaudio.h>
-#include <opus.h>
-#include <sigc++/sigc++.h>
 #include <spdlog/spdlog.h>
+#include <spdlog/sinks/stdout_color_sinks.h>
 
 #include "devices.hpp"
 
+#include "audio/context.hpp"
+
 #ifdef WITH_VOICE
 #include "voice/voice_audio.hpp"
 #endif
@@ -59,4 +57,3 @@ class AudioManager {
 
     bool m_ok = false;
 };
-#endif
diff --git a/src/audio/miniaudio/ma_pcm_rb.hpp b/src/audio/miniaudio/ma_pcm_rb.hpp
@@ -2,6 +2,8 @@
 
 #include <miniaudio.h>
 
+#include "audio/utils.hpp"
+
 namespace AbaddonClient::Audio::Miniaudio {
 
 class MaPCMRingBuffer {