Fixed a couple of typos, too tired to continue

This commit is contained in:
Dandaedre 2023-04-19 15:32:19 +02:00
parent 94c22474ad
commit 06e74b28c4
3 changed files with 72 additions and 15 deletions

View File

@ -6,7 +6,7 @@
use crate::midi::cleanup;
use crate::midi::connect_loop_with_callback;
use crate::midi::create_output_interface;
use crate::midi::prepare;
use clap::Parser;
use std::sync::Arc;
use std::sync::Mutex;
@ -24,7 +24,8 @@ mod projector;
#[command(author, version, about, long_about = None)]
struct Args {
/// The midi interface to select
midi_interface: Option<usize>,
midi_input: Option<usize>,
midi_output: Option<usize>,
}
fn main() {
@ -32,14 +33,24 @@ fn main() {
let args = Args::parse();
match args {
Args {
midi_interface: None,
midi_input: None,
midi_output: None,
} => {
midi::print_midi_interfaces();
return;
}
Args {
midi_interface: Some(_),
midi_input: Some(_),
midi_output: Some(_),
} => {}
Args {
midi_input: _,
midi_output: None,
} => {
midi::print_midi_interfaces();
return;
}
_ => {}
}
println!("{:?}", args);
let proj = Arc::new(Mutex::new(projector::Projector::new(
@ -55,23 +66,35 @@ fn main() {
// proj.lock().unwrap().get_osd().unwrap();
let mut output_interface =
create_output_interface(args.midi_interface.unwrap(), "Rusty MIDI Commander Output");
create_output_interface(args.midi_output, "Rusty MIDI Commander Output");
cleanup(&mut output_interface.lock().unwrap());
connect_loop_with_callback(
args.midi_interface.unwrap(),
args.midi_input.unwrap(),
"Rusty MIDI Commander Input",
&mut output_interface,
vec![
(
3,
Box::new(move || {
proj1.lock().unwrap().shutter_on().unwrap();
match proj1.lock().unwrap().shutter_on() {
Ok(_) => {}
Err(e) => {
println!(
"[ERROR] An error occurend while sending a (Shutter on) message"
);
println!(" {}", e)
}
};
}),
),
(
4,
Box::new(move || {
proj2.lock().unwrap().shutter_on().unwrap();
Box::new(move || match proj2.lock().unwrap().shutter_off() {
Ok(_) => {}
Err(e) => {
println!("[ERROR] An error occurend while sending a (Shutter off) message");
println!(" {}", e)
}
}),
),
],

View File

@ -15,15 +15,40 @@ lazy_static! {
pub fn print_midi_interfaces() {
// Create MIDI input and output instances
let midi_in = MidiInput::new("Rusty MIDI Commander Input").unwrap();
let midi_out = MidiOutput::new("Rusty MIDI Commander Output").unwrap();
// Get available MIDI input and output ports
let input_ports = midi_in.ports();
// let output_ports = midi_out.ports();
let output_ports = midi_out.ports();
// Print available input ports
println!("No interface selected, please select one:");
match (input_ports.len(), output_ports.len()) {
(0, 0) => {
println!(
"[ERROR] No MIDI interface was found, please ensure a MIDI interface is plugged in"
);
return;
}
(_, 0) => println!("No MIDI output interface was found, no feedback will be sent"),
(0, _) => {
println!(
"[ERROR] No MIDI input interface was found, please ensure a MIDI interface is plugged in"
);
return;
}
(_, _) => println!("No interface selected, please select one:"),
}
println!("[Input]");
for (i, port) in input_ports.iter().enumerate() {
println!(" {}: {}", i, midi_in.port_name(port).unwrap());
println!(" {}: {}", i, midi_in.port_name(port).unwrap());
}
if output_ports.len() == 0 {
return;
}
println!("[Output]");
for (i, port) in output_ports.iter().enumerate() {
println!(" {}: {}", i, midi_out.port_name(port).unwrap());
}
}
@ -81,9 +106,16 @@ pub fn connect_loop_with_callback(
loop {}
}
pub fn create_output_interface(port: usize, name: &str) -> Arc<Mutex<MidiOutputConnection>> {
let output_interface = MidiOutput::new(name).unwrap();
let output_port = &output_interface.ports()[port];
// Currently doesn't accept virtual output or no output
pub fn create_output_interface(
port: Option<usize>,
name: &str,
) -> Arc<Mutex<MidiOutputConnection>> {
let output_interface = match port {
None => MidiOutput::new(name).unwrap(),
Some(_) => MidiOutput::new(name).unwrap(),
};
let output_port = &output_interface.ports()[port.unwrap()];
Arc::new(Mutex::new(
output_interface
.connect(output_port, "Rusty MIDI Commander Output")

View File

@ -1,3 +1,5 @@
#![allow(dead_code)]
use base64::{engine::general_purpose, Engine as _};
use reqwest::blocking::{Client, RequestBuilder};
use std::error::Error;