Update code for new deps versions

src/main.rs

@@ -0,0 +1,139 @@
+// Copyright 2021 Tom A. Wagner <tom.a.wagner@protonmail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License version 3 as published by
+// the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+// SPDX-License-Identifier: GPL-3.0-only
+
+mod application;
+mod graph_manager;
+mod pipewire_connection;
+mod ui;
+
+use adw::{gtk, prelude::*};
+use libspa::{param::format::MediaType, utils::Direction};
+
+/// Messages sent by the GTK thread to notify the pipewire thread.
+#[derive(Debug, Clone)]
+pub enum GtkMessage {
+    /// Toggle a link between the two specified ports.
+    ToggleLink { port_from: u32, port_to: u32 },
+    /// Quit the event loop and let the thread finish.
+    Terminate,
+}
+
+/// Messages sent by the pipewire thread to notify the GTK thread.
+#[derive(Debug, Clone)]
+pub enum PipewireMessage {
+    NodeAdded {
+        id: u32,
+        name: String,
+        node_type: Option<NodeType>,
+    },
+    NodeNameChanged {
+        id: u32,
+        name: String,
+        media_name: String,
+    },
+    PortAdded {
+        id: u32,
+        node_id: u32,
+        name: String,
+        direction: Direction,
+    },
+    PortFormatChanged {
+        id: u32,
+        media_type: MediaType,
+    },
+    LinkAdded {
+        id: u32,
+        port_from: u32,
+        port_to: u32,
+        active: bool,
+        media_type: MediaType,
+    },
+    LinkStateChanged {
+        id: u32,
+        active: bool,
+    },
+    LinkFormatChanged {
+        id: u32,
+        media_type: MediaType,
+    },
+    NodeRemoved {
+        id: u32,
+    },
+    PortRemoved {
+        id: u32,
+        node_id: u32,
+    },
+    LinkRemoved {
+        id: u32,
+    },
+    Connecting,
+    Connected,
+    Disconnected,
+}
+
+#[derive(Debug, Clone)]
+pub enum NodeType {
+    Input,
+    Output,
+}
+
+#[derive(Debug, Clone)]
+pub struct PipewireLink {
+    pub node_from: u32,
+    pub port_from: u32,
+    pub node_to: u32,
+    pub port_to: u32,
+}
+
+static GLIB_LOGGER: glib::GlibLogger = glib::GlibLogger::new(
+    glib::GlibLoggerFormat::Structured,
+    glib::GlibLoggerDomain::CrateTarget,
+);
+
+fn init_glib_logger() {
+    log::set_logger(&GLIB_LOGGER).expect("Failed to set logger");
+
+    // Glib does not have a "Trace" log level, so only print messages "Debug" or higher priority.
+    log::set_max_level(log::LevelFilter::Debug);
+}
+
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    init_glib_logger();
+    gtk::init()?;
+
+    // Aquire main context so that we can attach the gtk channel later.
+    let ctx = glib::MainContext::default();
+    let _guard = ctx.acquire().unwrap();
+
+    // Start the pipewire thread with channels in both directions.
+
+    let (gtk_sender, gtk_receiver) = async_channel::bounded::<PipewireMessage>(64);
+    let (pw_sender, pw_receiver) = pipewire::channel::channel();
+    let pw_thread =
+        std::thread::spawn(move || pipewire_connection::thread_main(gtk_sender, pw_receiver));
+
+    let app = application::Application::new(gtk_receiver, pw_sender.clone());
+
+    app.run();
+
+    pw_sender
+        .send(GtkMessage::Terminate)
+        .expect("Failed to send message");
+
+    pw_thread.join().expect("Pipewire thread panicked");
+
+    Ok(())
+}

src/ui/graph/node.rs

@@ -15,7 +15,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 use adw::{glib, gtk, prelude::*, subclass::prelude::*};
-use pipewire::spa::Direction;
+use libspa::utils::Direction;
 
 use super::Port;
 
@@ -149,7 +149,7 @@ mod imp {
 
 glib::wrapper! {
     pub struct Node(ObjectSubclass<imp::Node>)
-        @extends gtk::Widget;
+        @extends gtk::Widget, @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget;
 }
 
 impl Node {

src/ui/graph/port_handle.rs

@@ -61,7 +61,7 @@ mod imp {
 
 glib::wrapper! {
     pub struct PortHandle(ObjectSubclass<imp::PortHandle>)
-        @extends gtk::Widget;
+        @extends gtk::Widget, @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget;
 }
 
 impl PortHandle {