diff options
| author | ouwou <26526779+ouwou@users.noreply.github.com> | 2022-09-02 01:25:33 -0400 |
|---|---|---|
| committer | ouwou <26526779+ouwou@users.noreply.github.com> | 2022-09-02 01:25:33 -0400 |
| commit | 0a049856782397a7464d03c317ce3788559cdeda (patch) | |
| tree | 9412d17c0ab9335d591d7b4590043b9cc4e3cc45 /src/abaddon.cpp | |
| parent | 9c8d9e54fe96f97bdda2be26bab571e4cbf0c597 (diff) | |
| download | abaddon-portaudio-0a049856782397a7464d03c317ce3788559cdeda.tar.gz abaddon-portaudio-0a049856782397a7464d03c317ce3788559cdeda.zip | |
make compile work if voice support is disabled
Diffstat (limited to 'src/abaddon.cpp')
| -rw-r--r-- | src/abaddon.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/abaddon.cpp b/src/abaddon.cpp index a3a228d..688aff4 100644 --- a/src/abaddon.cpp +++ b/src/abaddon.cpp @@ -220,6 +220,7 @@ int Abaddon::StartGTK() { return 1; } +#ifdef WITH_VOICE m_audio = std::make_unique<AudioManager>(); if (!m_audio->OK()) { Gtk::MessageDialog dlg(*m_main_window, "The audio engine could not be initialized!", false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); @@ -227,6 +228,7 @@ int Abaddon::StartGTK() { dlg.run(); return 1; } +#endif // store must be checked before this can be called m_main_window->UpdateComponents(); @@ -247,7 +249,10 @@ int Abaddon::StartGTK() { m_main_window->GetChannelList()->signal_action_channel_item_select().connect(sigc::bind(sigc::mem_fun(*this, &Abaddon::ActionChannelOpened), true)); m_main_window->GetChannelList()->signal_action_guild_leave().connect(sigc::mem_fun(*this, &Abaddon::ActionLeaveGuild)); m_main_window->GetChannelList()->signal_action_guild_settings().connect(sigc::mem_fun(*this, &Abaddon::ActionGuildSettings)); + +#ifdef WITH_VOICE m_main_window->GetChannelList()->signal_action_join_voice_channel().connect(sigc::mem_fun(*this, &Abaddon::ActionJoinVoiceChannel)); +#endif m_main_window->GetChatWindow()->signal_action_message_edit().connect(sigc::mem_fun(*this, &Abaddon::ActionChatEditMessage)); m_main_window->GetChatWindow()->signal_action_chat_submit().connect(sigc::mem_fun(*this, &Abaddon::ActionChatInputSubmit)); @@ -908,9 +913,11 @@ void Abaddon::ActionViewThreads(Snowflake channel_id) { window->show(); } +#ifdef WITH_VOICE void Abaddon::ActionJoinVoiceChannel(Snowflake channel_id) { m_discord.ConnectToVoice(channel_id); } +#endif std::optional<Glib::ustring> Abaddon::ShowTextPrompt(const Glib::ustring &prompt, const Glib::ustring &title, const Glib::ustring &placeholder, Gtk::Window *window) { TextInputDialog dlg(prompt, title, placeholder, window != nullptr ? *window : *m_main_window); @@ -951,9 +958,11 @@ EmojiResource &Abaddon::GetEmojis() { return m_emojis; } +#ifdef WITH_VOICE AudioManager &Abaddon::GetAudio() { return *m_audio.get(); } +#endif int main(int argc, char **argv) { if (std::getenv("ABADDON_NO_FC") == nullptr) |