diff --git a/rog-core/src/daemon.rs b/rog-core/src/daemon.rs index fa645d2b..3d2b6979 100644 --- a/rog-core/src/daemon.rs +++ b/rog-core/src/daemon.rs @@ -11,7 +11,7 @@ use dbus::{channel::Sender, nonblock::Process}; use dbus_tokio::connection; use log::{error, info, warn}; -use rog_client::{DBUS_IFACE, DBUS_PATH}; +use rog_aura::{DBUS_IFACE, DBUS_NAME, DBUS_PATH}; use std::error::Error; use std::sync::{mpsc, Arc}; use std::time::{Duration, Instant}; @@ -84,7 +84,7 @@ pub async fn start_daemon() -> Result<(), Box> { }); connection - .request_name(DBUS_IFACE, false, true, true) + .request_name(DBUS_NAME, false, true, true) .await?; let (aura_command_send, aura_command_recv) = mpsc::sync_channel::(1); diff --git a/rog-core/src/rog_dbus.rs b/rog-core/src/rog_dbus.rs index 11cd0d9e..6e88e4c2 100644 --- a/rog-core/src/rog_dbus.rs +++ b/rog-core/src/rog_dbus.rs @@ -50,10 +50,10 @@ pub(super) fn dbus_create_ledmultizone_method(effect: NestedVecType) -> Method("reply") - .inarg::, _>("bytearray") - .inarg::, _>("bytearray") - .inarg::, _>("bytearray") - .inarg::, _>("bytearray") + .inarg::, _>("bytearray1") + .inarg::, _>("bytearray2") + .inarg::, _>("bytearray3") + .inarg::, _>("bytearray4") } pub(super) fn dbus_create_ledeffect_method(effect: NestedVecType) -> Method { @@ -78,23 +78,23 @@ pub(super) fn dbus_create_ledeffect_method(effect: NestedVecType) -> Method, _>("bytearray") - .inarg::, _>("bytearray") - .inarg::, _>("bytearray") - .inarg::, _>("bytearray") - .inarg::, _>("bytearray") - .inarg::, _>("bytearray") - .inarg::, _>("bytearray") - .inarg::, _>("bytearray") - .inarg::, _>("bytearray") - .inarg::, _>("bytearray") - .inarg::, _>("bytearray") + .inarg::, _>("bytearray1") + .inarg::, _>("bytearray2") + .inarg::, _>("bytearray3") + .inarg::, _>("bytearray4") + .inarg::, _>("bytearray5") + .inarg::, _>("bytearray6") + .inarg::, _>("bytearray7") + .inarg::, _>("bytearray8") + .inarg::, _>("bytearray9") + .inarg::, _>("bytearray10") + .inarg::, _>("bytearray11") } pub(super) fn dbus_create_animatrix_method(effect: NestedVecType) -> Method { @@ -107,14 +107,14 @@ pub(super) fn dbus_create_animatrix_method(effect: NestedVecType) -> Method> = vec![iter.read()?, iter.read()?]; *lock = Some(byte_array); - Ok(vec![]) + Ok(vec!(m.msg.method_return())) } else { Err(MethodErr::failed("Could not lock daemon for access")) } } }) - .inarg::, _>("bytearray") - .inarg::, _>("bytearray") + .inarg::, _>("bytearray1") + .inarg::, _>("bytearray2") } pub(super) fn dbus_create_fan_mode_method(fan_mode: FanModeType) -> Method {