diff --git a/src/trx-client/Cargo.toml b/src/trx-client/Cargo.toml index 4b5dfe9..6726b12 100644 --- a/src/trx-client/Cargo.toml +++ b/src/trx-client/Cargo.toml @@ -18,6 +18,7 @@ clap = { workspace = true, features = ["derive"] } dirs = "6" libloading = "0.8" bytes = "1" +trx-app = { path = "../trx-app" } trx-core = { path = "../trx-core" } trx-protocol = { path = "../trx-protocol" } trx-frontend = { path = "trx-frontend" } diff --git a/src/trx-client/src/main.rs b/src/trx-client/src/main.rs index 3183b7f..c273c6b 100644 --- a/src/trx-client/src/main.rs +++ b/src/trx-client/src/main.rs @@ -17,6 +17,7 @@ use tokio::signal; use tokio::sync::{broadcast, mpsc, watch}; use tracing::info; +use trx_app::normalize_name; use trx_core::audio::AudioStreamInfo; use trx_core::rig::request::RigRequest; @@ -81,14 +82,6 @@ struct Cli { callsign: Option, } -/// Normalize a rig/frontend name to lowercase alphanumeric. -fn normalize_name(name: &str) -> String { - name.to_ascii_lowercase() - .chars() - .filter(|c| c.is_ascii_alphanumeric()) - .collect() -} - fn main() -> DynResult<()> { let rt = tokio::runtime::Runtime::new()?;