split out and move some files

src/abaddon.cpp

@@ -19,7 +19,7 @@
 #include "windows/profilewindow.hpp"
 #include "windows/pinnedwindow.hpp"
 #include "windows/threadswindow.hpp"
-#include "windows/voicewindow.hpp"
+#include "windows/voice/voicewindow.hpp"
 #include "startup.hpp"
 #include "notifications/notifications.hpp"
 #include "remoteauth/remoteauthdialog.hpp"

src/windows/voice/voicewindow.cpp

@@ -2,88 +2,16 @@
 
 // clang-format off
 
+#include "voicewindow.hpp"
+
 #include "abaddon.hpp"
 #include "audio/manager.hpp"
 #include "components/lazyimage.hpp"
-#include "voicesettingswindow.hpp"
-#include "voicewindow.hpp"
+#include "voicewindowuserlistentry.hpp"
+#include "windows/voicesettingswindow.hpp"
 
 // clang-format on
 
-class VoiceWindowUserListEntry : public Gtk::ListBoxRow {
-public:
-    VoiceWindowUserListEntry(Snowflake id)
-        : m_main(Gtk::ORIENTATION_VERTICAL)
-        , m_horz(Gtk::ORIENTATION_HORIZONTAL)
-        , m_avatar(32, 32)
-        , m_mute("Mute") {
-        m_name.set_halign(Gtk::ALIGN_START);
-        m_name.set_hexpand(true);
-        m_mute.set_halign(Gtk::ALIGN_END);
-
-        m_volume.set_range(0.0, 200.0);
-        m_volume.set_value_pos(Gtk::POS_LEFT);
-        m_volume.set_value(100.0);
-        m_volume.signal_value_changed().connect([this]() {
-            m_signal_volume.emit(m_volume.get_value() * 0.01);
-        });
-
-        m_horz.add(m_avatar);
-        m_horz.add(m_name);
-        m_horz.add(m_mute);
-        m_main.add(m_horz);
-        m_main.add(m_volume);
-        m_main.add(m_meter);
-        add(m_main);
-        show_all_children();
-
-        auto &discord = Abaddon::Get().GetDiscordClient();
-        const auto user = discord.GetUser(id);
-        if (user.has_value()) {
-            m_name.set_text(user->GetUsername());
-            m_avatar.SetURL(user->GetAvatarURL("png", "32"));
-        } else {
-            m_name.set_text("Unknown user");
-        }
-
-        m_mute.signal_toggled().connect([this]() {
-            m_signal_mute_cs.emit(m_mute.get_active());
-        });
-    }
-
-    void SetVolumeMeter(double frac) {
-        m_meter.SetVolume(frac);
-    }
-
-    void RestoreGain(double frac) {
-        m_volume.set_value(frac * 100.0);
-    }
-
-private:
-    Gtk::Box m_main;
-    Gtk::Box m_horz;
-    LazyImage m_avatar;
-    Gtk::Label m_name;
-    Gtk::CheckButton m_mute;
-    Gtk::Scale m_volume;
-    VolumeMeter m_meter;
-
-public:
-    using type_signal_mute_cs = sigc::signal<void(bool)>;
-    using type_signal_volume = sigc::signal<void(double)>;
-    type_signal_mute_cs signal_mute_cs() {
-        return m_signal_mute_cs;
-    }
-
-    type_signal_volume signal_volume() {
-        return m_signal_volume;
-    }
-
-private:
-    type_signal_mute_cs m_signal_mute_cs;
-    type_signal_volume m_signal_volume;
-};
-
 VoiceWindow::VoiceWindow(Snowflake channel_id)
     : m_main(Gtk::ORIENTATION_VERTICAL)
     , m_controls(Gtk::ORIENTATION_HORIZONTAL)

src/windows/voice/voicewindow.hpp

@@ -17,6 +17,7 @@
 // clang-format on
 
 class VoiceWindowUserListEntry;
+
 class VoiceWindow : public Gtk::Window {
 public:
     VoiceWindow(Snowflake channel_id);

src/windows/voice/voicewindowuserlistentry.cpp

@@ -0,0 +1,58 @@
+#include "voicewindowuserlistentry.hpp"
+
+#include "abaddon.hpp"
+
+VoiceWindowUserListEntry::VoiceWindowUserListEntry(Snowflake id)
+    : m_main(Gtk::ORIENTATION_VERTICAL)
+    , m_horz(Gtk::ORIENTATION_HORIZONTAL)
+    , m_avatar(32, 32)
+    , m_mute("Mute") {
+    m_name.set_halign(Gtk::ALIGN_START);
+    m_name.set_hexpand(true);
+    m_mute.set_halign(Gtk::ALIGN_END);
+
+    m_volume.set_range(0.0, 200.0);
+    m_volume.set_value_pos(Gtk::POS_LEFT);
+    m_volume.set_value(100.0);
+    m_volume.signal_value_changed().connect([this]() {
+        m_signal_volume.emit(m_volume.get_value() * 0.01);
+    });
+
+    m_horz.add(m_avatar);
+    m_horz.add(m_name);
+    m_horz.add(m_mute);
+    m_main.add(m_horz);
+    m_main.add(m_volume);
+    m_main.add(m_meter);
+    add(m_main);
+    show_all_children();
+
+    auto &discord = Abaddon::Get().GetDiscordClient();
+    const auto user = discord.GetUser(id);
+    if (user.has_value()) {
+        m_name.set_text(user->GetUsername());
+        m_avatar.SetURL(user->GetAvatarURL("png", "32"));
+    } else {
+        m_name.set_text("Unknown user");
+    }
+
+    m_mute.signal_toggled().connect([this]() {
+        m_signal_mute_cs.emit(m_mute.get_active());
+    });
+}
+
+void VoiceWindowUserListEntry::SetVolumeMeter(double frac) {
+    m_meter.SetVolume(frac);
+}
+
+void VoiceWindowUserListEntry::RestoreGain(double frac) {
+    m_volume.set_value(frac * 100.0);
+}
+
+VoiceWindowUserListEntry::type_signal_mute_cs VoiceWindowUserListEntry::signal_mute_cs() {
+    return m_signal_mute_cs;
+}
+
+VoiceWindowUserListEntry::type_signal_volume VoiceWindowUserListEntry::signal_volume() {
+    return m_signal_volume;
+}

src/windows/voice/voicewindowuserlistentry.hpp

@@ -0,0 +1,38 @@
+#pragma once
+
+#include "components/lazyimage.hpp"
+#include "components/volumemeter.hpp"
+#include "discord/snowflake.hpp"
+
+#include <gtkmm/box.h>
+#include <gtkmm/checkbutton.h>
+#include <gtkmm/label.h>
+#include <gtkmm/listboxrow.h>
+#include <gtkmm/scale.h>
+
+class VoiceWindowUserListEntry : public Gtk::ListBoxRow {
+public:
+    VoiceWindowUserListEntry(Snowflake id);
+
+    void SetVolumeMeter(double frac);
+    void RestoreGain(double frac);
+
+private:
+    Gtk::Box m_main;
+    Gtk::Box m_horz;
+    LazyImage m_avatar;
+    Gtk::Label m_name;
+    Gtk::CheckButton m_mute;
+    Gtk::Scale m_volume;
+    VolumeMeter m_meter;
+
+public:
+    using type_signal_mute_cs = sigc::signal<void(bool)>;
+    using type_signal_volume = sigc::signal<void(double)>;
+    type_signal_mute_cs signal_mute_cs();
+    type_signal_volume signal_volume();
+
+private:
+    type_signal_mute_cs m_signal_mute_cs;
+    type_signal_volume m_signal_volume;
+};