asonix/streamdeck-workspace
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update dependencies

Browse source
This commit is contained in:
Aode (Lion) 2022-02-05 19:40:46 -06:00
parent b5a8adab18
commit 5870fe1e78
12 changed files with 473 additions and 709 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1096
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

9
Cargo.toml
View file

@ -1,8 +1,7 @@
[workspace]
members = [
"./streamdeck-common",
"./streamdeck-daemon",
"./streamdeck-gtk",
"./marble",
"./obws"
"./streamdeck-common",
"./streamdeck-daemon",
"./streamdeck-gtk",
"./marble",
]

6
marble/Cargo.toml
View file

@ -9,10 +9,10 @@ edition = "2018"
[dependencies]
event-listener = "2.5.1"
futures-core = "0.3.15"
gtk = { git = "https://github.com/gtk-rs/gtk3-rs" }
glib = { git = "https://github.com/gtk-rs/gtk-rs-core" }
gtk = "0.15.3"
glib = "0.15.3"
once_cell = "1.7.2"
pango = { git = "https://github.com/gtk-rs/gtk-rs-core" }
pango = "0.15.2"
[dev-dependencies]
futures-lite = "1.11.3"

1
obws

@ -1 +0,0 @@
Subproject commit 4babdad07cc6e12830071253f3d2da02a86ff366

8
streamdeck-daemon/Cargo.toml
View file

@ -15,13 +15,13 @@ anyhow = "1"
base64 = "0.13.0"
dbus = { version = "0.9", optional = true }
dbus-tokio = { version = "0.7", optional = true }
dbus-crossroads = { version = "0.3.0", optional = true }
directories = "3.0"
dbus-crossroads = { version = "0.5.0", optional = true }
directories = "4.0"
either = "1.6.1"
env_logger = "0.8.0"
env_logger = "0.9.0"
futures-util = "0.3.15"
log = "0.4.0"
obws = { version = "0.7.0", path = "../obws" }
obws = "0.9.0"
rand = "0.8.3"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"

23
streamdeck-gtk/Cargo.toml
View file

@ -11,22 +11,21 @@ anyhow = "1"
async-io = "1.4.1"
async-stream = "0.3.1"
streamdeck-common = { path = "../streamdeck-common" }
env_logger = "0.8.3"
env_logger = "0.9.0"
event-listener = "2.5.1"
futures-channel = { version = "0.3.14", features = ["sink"] }
futures-core = "0.3.14"
futures-util = { version = "0.3", features = ["sink"] }
gdk = { git = "https://github.com/gtk-rs/gtk3-rs" }
gdk-pixbuf = { git = "https://github.com/gtk-rs/gtk-rs-core" }
gtk = { git = "https://github.com/gtk-rs/gtk3-rs" }
gio = { git = "https://github.com/gtk-rs/gtk-rs-core" }
glib = { git = "https://github.com/gtk-rs/gtk-rs-core" }
glib-sys = { git = "https://github.com/gtk-rs/gtk-rs-core" }
libhandy = { git = "https://gitlab.gnome.org/World/Rust/libhandy-rs" }
gdk = "0.15.1"
gdk-pixbuf = "0.15.1"
gtk = "0.15.3"
gio = "0.15.1"
glib = "0.15.3"
glib-sys = "0.15.1"
libhandy = "0.9.0"
log = "0.4"
marble = { git = "https://git.asonix.dog/asonix/streamdeck-workspace", branch = "main" }
marble = { path = "../marble" }
once_cell = "1.7.2"
pango = { git = "https://github.com/gtk-rs/gtk-rs-core" }
pango = "0.15.2"
serde_json = "1"
zbus = { git = "https://gitlab.freedesktop.org/dbus/zbus", branch = "main" }
zvariant = { git = "https://gitlab.freedesktop.org/dbus/zbus", branch = "main" }
zbus = "2.1.1"

6
streamdeck-gtk/src/daemon.rs
View file

@ -13,7 +13,7 @@ use std::{
time::{Duration, Instant},
};
use streamdeck_common::{Command, ObsState, Query, QueryResponse, Scene, SceneItem};
use zbus::{azync::Connection, dbus_proxy, Result};
use zbus::{dbus_proxy, Connection, Result};
pub(crate) async fn state_management() {
let new_deck_stream = Handle::current().state().added_deck_stream();
@ -988,8 +988,8 @@ fn connect() -> futures_channel::mpsc::Sender<DBusMessage> {
}
async fn process_messages(rx: &mut Receiver<DBusMessage>) -> anyhow::Result<()> {
let conn = Connection::new_session().await?;
let daemon = AsyncStreamdeckDaemonProxy::new(&conn);
let conn = Connection::session().await?;
let daemon = StreamdeckDaemonProxy::new(&conn).await?;
while let Some(msg) = rx.next().await {
match msg {

4
streamdeck-gtk/src/main_window.rs
View file

@ -1,6 +1,6 @@
use gio::prelude::SettingsExt;
use gtk::{prelude::*, subclass::prelude::*};
use libhandy::prelude::HeaderBarExt;
use libhandy::prelude::HdyHeaderBarExt;
glib::wrapper! {
pub struct MainWindow(ObjectSubclass<imp::MainWindow>)
@ -176,5 +176,5 @@ mod imp {
impl BinImpl for MainWindow {}
impl WindowImpl for MainWindow {}
impl ApplicationWindowImpl for MainWindow {}
impl libhandy::subclass::prelude::ApplicationWindowImpl for MainWindow {}
impl libhandy::subclass::prelude::HdyApplicationWindowImpl for MainWindow {}
}

3
streamdeck-gtk/src/views/deck_view.rs
View file

@ -71,8 +71,7 @@ mod imp {
}
}));
let scroll = gtk::ScrolledWindow::new::<gtk::Adjustment, gtk::Adjustment>(None, None);
scroll.set_expand(true);
let scroll = gtk::ScrolledWindow::builder().expand(true).build();
scroll.add(&deck_list);
let sidebar = gtk::Grid::new();

3
streamdeck-gtk/src/widgets/command_list.rs
View file

@ -199,8 +199,7 @@ mod imp {
action_bar.add(&remove_button);
action_bar.show_all();
let scrolled = gtk::ScrolledWindow::new::<gtk::Adjustment, gtk::Adjustment>(None, None);
scrolled.set_expand(true);
let scrolled = gtk::ScrolledWindow::builder().expand(true).build();
scrolled.add(&list_box);
let grid = gtk::Grid::new();

14
streamdeck-gtk/src/widgets/deck_item.rs
View file

@ -36,15 +36,11 @@ impl DeckItem {
}
pub(crate) fn serial_number(&self) -> Option<String> {
let value = self.property("serial-number").ok()?;
value.get().ok()
self.try_property("serial-number").ok()
}
pub(crate) fn device_name(&self) -> Option<String> {
let value = self.property("device-name").ok()?;
value.get().ok()
self.try_property("device-name").ok()
}
fn handle_clicked(&self) -> Option<()> {
@ -153,21 +149,21 @@ mod imp {
fn properties() -> &'static [glib::ParamSpec] {
static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
vec![
glib::ParamSpec::new_string(
glib::ParamSpecString::new(
"serial-number",
"Serial Number",
"The serial number of the streamdeck",
None,
glib::ParamFlags::READWRITE | glib::ParamFlags::CONSTRUCT_ONLY,
),
glib::ParamSpec::new_string(
glib::ParamSpecString::new(
"device-name",
"Device Name",
"The name of the streamdeck",
None,
glib::ParamFlags::READWRITE,
),
glib::ParamSpec::new_string(
glib::ParamSpecString::new(
"port-name",
"Port name",
"The name of the streamdecks' serial port",

9
streamdeck-gtk/src/widgets/deck_list.rs
View file

@ -119,7 +119,7 @@ mod imp {
list_box.set_header_func(Some(Box::new(
glib::clone!(@weak usb_label => move |row, prev| {
if prev.is_some() {
row.set_header::<gtk::Label>(None);
row.set_header(None as Option<&gtk::Widget>);
return;
}
@ -131,9 +131,10 @@ mod imp {
}),
)));
let scroll = gtk::ScrolledWindow::new::<gtk::Adjustment, gtk::Adjustment>(None, None);
scroll.set_hscrollbar_policy(gtk::PolicyType::Never);
scroll.set_hexpand(true);
let scroll = gtk::ScrolledWindow::builder()
.hexpand(true)
.hscrollbar_policy(gtk::PolicyType::Never)
.build();
scroll.add(&list_box);
let frame = gtk::Frame::new(None);