diff options
| author | ouwou <26526779+ouwou@users.noreply.github.com> | 2023-03-14 14:18:54 -0400 |
|---|---|---|
| committer | ouwou <26526779+ouwou@users.noreply.github.com> | 2023-03-14 14:18:54 -0400 |
| commit | e51d5d1980b1ab0c1738836762900f7bd9bc3c3f (patch) | |
| tree | bcf287803795aea72c06b18c1a329fb41621e280 | |
| parent | c075f16c17d8048446a994a41b0ebf46a0c00bdd (diff) | |
| download | abaddon-portaudio-e51d5d1980b1ab0c1738836762900f7bd9bc3c3f.tar.gz abaddon-portaudio-e51d5d1980b1ab0c1738836762900f7bd9bc3c3f.zip | |
more WITH_VOICE guards
| -rw-r--r-- | src/components/voiceinfobox.cpp | 10 | ||||
| -rw-r--r-- | src/components/voiceinfobox.hpp | 12 | ||||
| -rw-r--r-- | src/windows/mainwindow.cpp | 4 | ||||
| -rw-r--r-- | src/windows/mainwindow.hpp | 3 |
4 files changed, 22 insertions, 7 deletions
diff --git a/src/components/voiceinfobox.cpp b/src/components/voiceinfobox.cpp index 456c5f0..b870794 100644 --- a/src/components/voiceinfobox.cpp +++ b/src/components/voiceinfobox.cpp @@ -1,6 +1,8 @@ -#include "voiceinfobox.hpp" -#include "abaddon.hpp" -#include "util.hpp" +#ifdef WITH_VOICE + + #include "voiceinfobox.hpp" + #include "abaddon.hpp" + #include "util.hpp" VoiceInfoBox::VoiceInfoBox() : Gtk::Box(Gtk::ORIENTATION_HORIZONTAL) @@ -97,3 +99,5 @@ VoiceInfoBox::VoiceInfoBox() show_all_children(); } + +#endif diff --git a/src/components/voiceinfobox.hpp b/src/components/voiceinfobox.hpp index 0117c0d..74aad27 100644 --- a/src/components/voiceinfobox.hpp +++ b/src/components/voiceinfobox.hpp @@ -1,9 +1,11 @@ #pragma once -#include <gtkmm/box.h> -#include <gtkmm/eventbox.h> -#include <gtkmm/image.h> -#include <gtkmm/label.h> +#ifdef WITH_VOICE + + #include <gtkmm/box.h> + #include <gtkmm/eventbox.h> + #include <gtkmm/image.h> + #include <gtkmm/label.h> class VoiceInfoBox : public Gtk::Box { public: @@ -18,3 +20,5 @@ private: Gtk::EventBox m_disconnect_ev; Gtk::Image m_disconnect_img; }; + +#endif diff --git a/src/windows/mainwindow.cpp b/src/windows/mainwindow.cpp index 73b78de..f867db9 100644 --- a/src/windows/mainwindow.cpp +++ b/src/windows/mainwindow.cpp @@ -51,10 +51,14 @@ MainWindow::MainWindow() m_content_stack.set_visible_child("chat"); m_content_stack.show(); +#ifdef WITH_VOICE m_voice_info.show(); +#endif m_left_pane.add(m_channel_list); +#ifdef WITH_VOICE m_left_pane.add(m_voice_info); +#endif m_left_pane.show(); m_chan_content_paned.pack1(m_left_pane); diff --git a/src/windows/mainwindow.hpp b/src/windows/mainwindow.hpp index 5cad82f..e075c10 100644 --- a/src/windows/mainwindow.hpp +++ b/src/windows/mainwindow.hpp @@ -57,7 +57,10 @@ private: ChatWindow m_chat; MemberList m_members; FriendsList m_friends; + +#ifdef WITH_VOICE VoiceInfoBox m_voice_info; +#endif Gtk::Box m_left_pane; |