diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 index 0000000..8e34892 --- /dev/null +++ b/Cargo.lock @@ -0,0 +1,458 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "addr2line" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "anyhow" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "backtrace" +version = "0.3.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", + "windows-targets", +] + +[[package]] +name = "bitflags" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" + +[[package]] +name = "carla_osc_bridge" +version = "0.1.0" +dependencies = [ + "anyhow", + "rosc", + "tokio", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "deranged" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "gimli" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" + +[[package]] +name = "itoa" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] +name = "libc" +version = "0.2.172" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" +dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" +dependencies = [ + "libc", + "wasi", + "windows-sys", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "object" +version = "0.36.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" +dependencies = [ + "memchr", +] + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "proc-macro2" +version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3" +dependencies = [ + "bitflags", +] + +[[package]] +name = "rosc" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd37602e1513794e952274082d074e8d31aa7f64d047e3acb746c91db40600a5" +dependencies = [ + "byteorder", + "nom", + "time", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "serde" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" +dependencies = [ + "libc", +] + +[[package]] +name = "smallvec" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" + +[[package]] +name = "socket2" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "syn" +version = "2.0.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "time" +version = "0.3.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" + +[[package]] +name = "time-macros" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tokio" +version = "1.44.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys", +] + +[[package]] +name = "tokio-macros" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "unicode-ident" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/Cargo.toml b/Cargo.toml index cd2faac..c436af5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,3 +4,6 @@ version = "0.1.0" edition = "2024" [dependencies] +anyhow = "1.0.98" +rosc = "0.11.4" +tokio = { version = "1.44.2", features = ["full"] } diff --git a/src/carla.rs b/src/carla.rs new file mode 100644 index 0000000..d8c9a8a --- /dev/null +++ b/src/carla.rs @@ -0,0 +1,140 @@ +use anyhow::Result; +use rosc::{ + OscMessage, OscPacket, OscType, + decoder::decode_udp, + encoder::{encode, encode_tcp}, +}; +use tokio::{ + io::{AsyncReadExt, AsyncWriteExt}, + net::{TcpListener, TcpStream, UdpSocket}, + spawn, + sync::mpsc::{Receiver, Sender}, + task::JoinSet, +}; + +use crate::Args; + +pub async fn setup_carla(args: Args, tx: Sender) -> Result<()> { + let mut set = JoinSet::new(); + set.spawn(tcp_client(args.clone(), tx.clone())); + set.spawn(udp_client(args, tx)); + + while let Some(res) = set.join_next().await { + res??; + } + + Ok(()) +} + +pub async fn setup_forwarder(args: Args, rx: Receiver) -> Result<()> { + let mut set = JoinSet::new(); + set.spawn(udp_sender(args, rx)); + + while let Some(res) = set.join_next().await { + res??; + } + + Ok(()) +} + +async fn tcp_client(args: Args, tx: Sender) -> Result<()> { + println!("Starting TCP carla client"); + let sock = TcpListener::bind(format!("0.0.0.0:{}", args.carla_recv_port)) + .await + .unwrap(); + register_tcp(args).await?; + + loop { + let (stream, _) = sock.accept().await?; + spawn(tcp_connection(stream, tx.clone())); + } +} + +async fn register_tcp(args: Args) -> Result<()> { + let mut stream = TcpStream::connect(args.carla_host).await?; + + let register = OscMessage { + addr: String::from("/register"), + args: vec![OscType::String(format!( + "osc.tcp://{}:{}/Carla", + args.bridge_host, args.carla_recv_port + ))], + }; + let packet = OscPacket::Message(register); + let packet = encode_tcp(&packet)?; + stream.write_all(&packet).await?; + + stream.shutdown().await?; + + Ok(()) +} + +async fn tcp_connection(stream: TcpStream, tx: Sender) -> Result<()> { + println!("Accepted new Carla TCP connection"); + let mut buf = vec![0; 1024]; + let mut stream = stream; + + loop { + let bytes = stream.read(&mut buf).await?; + let packet = &buf[0..bytes]; + if bytes > 4 { + let (_, packet) = decode_udp(packet)?; + tx.send(packet).await?; + } + } +} + +async fn udp_client(args: Args, tx: Sender) -> Result<()> { + println!("Starting UDP carla client"); + let mut sock = UdpSocket::bind(format!("0.0.0.0:{}", args.carla_recv_port)) + .await + .unwrap(); + register_udp(args, &mut sock).await?; + + let mut buf = vec![0; 1024]; + + loop { + let bytes = sock.recv(&mut buf).await?; + let packet = &buf[0..bytes]; + let (_, packet) = decode_udp(packet)?; + tx.send(packet).await?; + } +} + +async fn register_udp(args: Args, sock: &mut UdpSocket) -> Result<()> { + let register = OscMessage { + addr: String::from("/register"), + args: vec![OscType::String(format!( + "osc.tcp://{}:{}/Carla", + args.bridge_host, args.carla_recv_port + ))], + }; + let packet = OscPacket::Message(register); + let packet = encode(&packet)?; + sock.connect(args.carla_host).await?; + sock.send(&packet).await?; + + Ok(()) +} + +async fn udp_sender(args: Args, rx: Receiver) -> Result<()> { + let sock = UdpSocket::bind(format!("0.0.0.0:{}", args.carla_send_port)) + .await + .unwrap(); + sock.connect(args.carla_host).await?; + let mut rx = rx; + + loop { + let packet = rx.recv().await; + match packet { + Some(packet) => { + let packet = encode(&packet)?; + sock.send(&packet).await?; + } + None => { + println!("No more packets"); + return Ok(()); + } + }; + } +} diff --git a/src/client.rs b/src/client.rs new file mode 100644 index 0000000..db5c71e --- /dev/null +++ b/src/client.rs @@ -0,0 +1,63 @@ +use anyhow::Result; +use rosc::{OscBundle, OscMessage, OscPacket, encoder::encode}; +use tokio::{net::UdpSocket, sync::mpsc::Receiver, task::JoinSet}; + +use crate::Args; + +pub async fn setup_clients(args: Args, rx: Receiver) -> Result<()> { + println!("Starting client"); + + let mut set = JoinSet::new(); + set.spawn(client(args.clone(), rx)); + + while let Some(res) = set.join_next().await { + res??; + } + + Ok(()) +} + +async fn client(args: Args, rx: Receiver) -> Result<()> { + let mut rx = rx; + let clients = args.clients.clone(); + let sock = UdpSocket::bind(format!("0.0.0.0:{}", args.client_send_port)).await?; + + loop { + let packet = rx.recv().await; + match packet { + Some(packet) => { + if let Some(packet) = translate_packet(packet) { + let packet = encode(&packet)?; + for client in &clients { + sock.send_to(&packet, client).await?; + } + } + } + None => { + println!("No more packets"); + return Ok(()); + } + }; + } +} + +fn translate_packet(packet: OscPacket) -> Option { + match packet { + OscPacket::Message(ref msg) => match msg.addr.as_str() { + "/Carla/param" => Some(packet), + "/Carla/cb" => Some(OscPacket::Message(OscMessage { + addr: String::from("/Carla/param"), + args: vec![ + msg.args[1].clone(), + msg.args[2].clone(), + msg.args[5].clone(), + ], + })), + _ => None, + }, + OscPacket::Bundle(OscBundle { timetag, content }) => { + let content = content.into_iter().filter_map(translate_packet).collect(); + Some(OscPacket::Bundle(OscBundle { timetag, content })) + } + } +} diff --git a/src/main.rs b/src/main.rs index e7a11a9..deb25b3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,3 +1,42 @@ -fn main() { - println!("Hello, world!"); +use tokio::{sync::mpsc, task::JoinSet}; + +mod carla; +mod client; +mod server; + +#[derive(Debug, Clone)] +struct Args { + bridge_host: String, + carla_host: String, + clients: Vec, + carla_recv_port: u16, + carla_send_port: u16, + client_recv_port: u16, + client_send_port: u16, +} + +#[tokio::main] +async fn main() { + let args = Args { + bridge_host: String::from("10.20.60.254"), + carla_host: String::from("10.20.60.251:22752"), + clients: vec![String::from("10.20.60.251:8080")], + carla_recv_port: 10400, + carla_send_port: 10401, + client_recv_port: 10402, + client_send_port: 10403, + }; + + let (from_carla_tx, from_carla_rx) = mpsc::channel(1024); + let (to_carla_tx, to_carla_rx) = mpsc::channel(1024); + + let mut set = JoinSet::new(); + set.spawn(carla::setup_carla(args.clone(), from_carla_tx)); + set.spawn(client::setup_clients(args.clone(), from_carla_rx)); + set.spawn(server::setup_server(args.clone(), to_carla_tx)); + set.spawn(carla::setup_forwarder(args, to_carla_rx)); + + while let Some(res) = set.join_next().await { + res.unwrap().unwrap(); + } } diff --git a/src/server.rs b/src/server.rs new file mode 100644 index 0000000..1765c1d --- /dev/null +++ b/src/server.rs @@ -0,0 +1,52 @@ +use anyhow::Result; +use rosc::{OscBundle, OscMessage, OscPacket, decoder::decode_udp}; +use tokio::{net::UdpSocket, sync::mpsc::Sender, task::JoinSet}; + +use crate::Args; + +pub async fn setup_server(args: Args, tx: Sender) -> Result<()> { + println!("Starting server"); + + let mut set = JoinSet::new(); + set.spawn(server(args, tx)); + + while let Some(res) = set.join_next().await { + res??; + } + + Ok(()) +} + +async fn server(args: Args, tx: Sender) -> Result<()> { + println!("Starting UDP OSC Server"); + let sock = UdpSocket::bind(format!("0.0.0.0:{}", args.client_recv_port)) + .await + .unwrap(); + + let mut buf = vec![0; 1024]; + + loop { + let bytes = sock.recv(&mut buf).await?; + let packet = &buf[0..bytes]; + let (_, packet) = decode_udp(packet)?; + if let Some(packet) = translate_packet(packet) { + tx.send(packet).await?; + } + } +} + +fn translate_packet(packet: OscPacket) -> Option { + match packet { + OscPacket::Message(ref msg) => match msg.addr.as_str() { + "/Carla/param" => Some(OscPacket::Message(OscMessage { + addr: format!("/Carla/{}/set_parameter_value", msg.args[0].clone().int()?), + args: vec![msg.args[1].clone(), msg.args[2].clone()], + })), + _ => None, + }, + OscPacket::Bundle(OscBundle { timetag, content }) => { + let content = content.into_iter().filter_map(translate_packet).collect(); + Some(OscPacket::Bundle(OscBundle { timetag, content })) + } + } +}