mirror of
https://codeberg.org/unspeaker/tek.git
synced 2025-12-07 04:06:45 +01:00
group devices
This commit is contained in:
parent
60627ac3e5
commit
5afed6f055
8 changed files with 147 additions and 267 deletions
261
src/main.rs
261
src/main.rs
|
|
@ -6,13 +6,9 @@ use clap::{Parser, Subcommand};
|
|||
use std::error::Error;
|
||||
|
||||
pub mod cli;
|
||||
pub mod device;
|
||||
pub mod prelude;
|
||||
pub mod engine;
|
||||
pub mod transport;
|
||||
pub mod mixer;
|
||||
pub mod looper;
|
||||
pub mod sampler;
|
||||
pub mod sequencer;
|
||||
pub mod render;
|
||||
pub mod config;
|
||||
|
||||
|
|
@ -23,60 +19,57 @@ fn main () -> Result<(), Box<dyn Error>> {
|
|||
let cli = cli::Cli::parse();
|
||||
let xdg = microxdg::XdgApp::new("dawdle")?;
|
||||
crate::config::create_dirs(&xdg)?;
|
||||
if let Some(command) = cli.command {
|
||||
run_one(&command)
|
||||
} else {
|
||||
run_all()
|
||||
}
|
||||
}
|
||||
|
||||
fn run_one (command: &cli::Command) -> Result<(), Box<dyn Error>> {
|
||||
let mut engine = crate::engine::Engine::new(None)?;
|
||||
match command {
|
||||
cli::Command::Transport => engine.run(
|
||||
transport::Transport::new(engine.jack_client.as_client())?,
|
||||
match cli.command {
|
||||
Some(cli::Command::Transport) => engine.run(
|
||||
crate::device::transport::Transport::new(engine.jack_client.as_client())?,
|
||||
),
|
||||
cli::Command::Mixer => engine.run(
|
||||
mixer::Mixer::new()?,
|
||||
Some(cli::Command::Mixer) => engine.run(
|
||||
crate::device::mixer::Mixer::new()?,
|
||||
),
|
||||
cli::Command::Looper => engine.run(
|
||||
looper::Looper::new()?,
|
||||
Some(cli::Command::Looper) => engine.run(
|
||||
crate::device::looper::Looper::new()?,
|
||||
),
|
||||
cli::Command::Sampler => engine.run(
|
||||
sampler::Sampler::new()?,
|
||||
Some(cli::Command::Sampler) => engine.run(
|
||||
crate::device::sampler::Sampler::new()?,
|
||||
),
|
||||
cli::Command::Sequencer => engine.run(
|
||||
sequencer::Sequencer::new(Some("sequencer"))?,
|
||||
Some(cli::Command::Sequencer) => engine.run(
|
||||
crate::device::sequencer::Sequencer::new(Some("Sequencer"))?,
|
||||
),
|
||||
None => engine.run(App {
|
||||
exited: false,
|
||||
mode: Mode::Sequencer,
|
||||
transport: crate::device::transport::Transport::new(
|
||||
engine.jack_client.as_client()
|
||||
)?,
|
||||
focus: 0,
|
||||
devices: vec![
|
||||
crate::device::Device::Sequencer(
|
||||
crate::device::sequencer::Sequencer::new(Some("Melody#000"))?
|
||||
),
|
||||
crate::device::Device::Sequencer(
|
||||
crate::device::sequencer::Sequencer::new(Some("Rhythm#000"))?
|
||||
),
|
||||
crate::device::Device::Sampler(
|
||||
crate::device::sampler::Sampler::new()?
|
||||
),
|
||||
crate::device::Device::Mixer(
|
||||
crate::device::mixer::Mixer::new()?
|
||||
),
|
||||
crate::device::Device::Looper(
|
||||
crate::device::looper::Looper::new()?
|
||||
),
|
||||
]
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
fn run_all () -> Result<(), Box<dyn Error>> {
|
||||
let mut engine = crate::engine::Engine::new(None)?;
|
||||
engine.run(App {
|
||||
exited: false,
|
||||
mode: Mode::Sequencer,
|
||||
transport: transport::Transport::new(engine.jack_client.as_client())?,
|
||||
sequencers: vec![
|
||||
sequencer::Sequencer::new(Some("Melody#000"))?,
|
||||
sequencer::Sequencer::new(Some("Rhythm#000"))?,
|
||||
],
|
||||
mixer: mixer::Mixer::new()?,
|
||||
looper: looper::Looper::new()?,
|
||||
sampler: sampler::Sampler::new()?,
|
||||
actions: vec![],
|
||||
})
|
||||
}
|
||||
|
||||
struct App {
|
||||
exited: bool,
|
||||
mode: Mode,
|
||||
transport: crate::transport::Transport,
|
||||
mixer: crate::mixer::Mixer,
|
||||
looper: crate::looper::Looper,
|
||||
sampler: crate::sampler::Sampler,
|
||||
sequencers: Vec<crate::sequencer::Sequencer>,
|
||||
actions: Vec<(&'static str, &'static str)>,
|
||||
transport: crate::device::transport::Transport,
|
||||
focus: usize,
|
||||
devices: Vec<crate::device::Device>,
|
||||
}
|
||||
|
||||
#[derive(PartialEq)]
|
||||
|
|
@ -99,117 +92,23 @@ impl Exitable for App {
|
|||
|
||||
impl WidgetRef for App {
|
||||
fn render_ref (&self, area: Rect, buffer: &mut Buffer) {
|
||||
use ratatui::{widgets::*, style::Stylize};
|
||||
use ratatui::style::Stylize;
|
||||
let mut constraints = vec![
|
||||
Constraint::Length(4),
|
||||
Constraint::Max(18),
|
||||
Constraint::Max(18),
|
||||
Constraint::Max(0),
|
||||
Constraint::Max(0),
|
||||
Constraint::Max(0),
|
||||
];
|
||||
let areas = Layout::default()
|
||||
.direction(Direction::Vertical)
|
||||
.constraints([
|
||||
Constraint::Length(4),
|
||||
Constraint::Max(18),
|
||||
Constraint::Max(18),
|
||||
].clone())
|
||||
.constraints(&constraints)
|
||||
.split(area);
|
||||
self.transport.render(area, buffer);
|
||||
self.sequencers[0].render(areas[1], buffer);
|
||||
self.sequencers[1].render(areas[2], buffer);
|
||||
|
||||
//buffer.set_string(
|
||||
//area.x, area.y + 5,
|
||||
//format!(" [ ] Melody#000 │1.1 │1.2 │1.3 │1.4 │ → None "),
|
||||
//Style::default()
|
||||
//);
|
||||
//buffer.set_string(
|
||||
//area.x, area.y + 6,
|
||||
//format!(" Variation: │A │B │C │D │E │F │G │H │"),
|
||||
//Style::default()
|
||||
//);
|
||||
//buffer.set_string(
|
||||
//area.x, area.y + 7,
|
||||
//format!(" [x] Chain 𝄆 A A B A 𝄇"),
|
||||
//Style::default()
|
||||
//);
|
||||
|
||||
//buffer.set_string(
|
||||
//area.x, area.y,
|
||||
//format!("│"),
|
||||
//Style::default().black()
|
||||
//);
|
||||
//buffer.set_string(
|
||||
//area.x + area.width - 1, area.y,
|
||||
//format!("│"),
|
||||
//Style::default().black()
|
||||
//);
|
||||
//buffer.set_string(
|
||||
//area.x, area.y + 1,
|
||||
//format!("╰{}╯", "─".repeat((area.width - 2) as usize)),
|
||||
//Style::default().black()
|
||||
//);
|
||||
|
||||
////Paragraph::new("|Project: The Witty Gerbils - Sha Na Na\n|Rewind |Play |BPM▐▔▔▔▔▔▔▔▔▔▔▔▔▔▔▌\n▐ ⯈ Play/Pause ▌\n▐▁▁▁▁▁▁▁▁▁▁▁▁▁▁▌")
|
||||
//Paragraph::new("|Project: The Witty Gerbils - Sha Na Na\n|Rewind |Play |Beat 1.1.0 |BPM 113.000 |Time: 123.456 |Rate: 44100Hz |Frame: 2000000000")
|
||||
//.render(transport_area, buffer);
|
||||
|
||||
//self.transport.render(main[0].inner(&Margin {
|
||||
//vertical: 0,
|
||||
//horizontal: 1,
|
||||
//}), buffer);
|
||||
//buffer.set_string(
|
||||
//area.x, main[1].y-1,
|
||||
//format!("╭{}╮", "─".repeat((area.width - 2) as usize)),
|
||||
//Style::default().black()
|
||||
//);
|
||||
//Paragraph::new("│|Melody #000\n│\n│|Port:\n│|Channel:\n│\n│\n│\n│\n│\n│\n│\n│\n│\n│|Variation:")
|
||||
//.render(side[1], buffer);
|
||||
//self.sequencer.render(main[1].inner(&Margin {
|
||||
//vertical: 0,
|
||||
//horizontal: 1,
|
||||
//}), buffer);
|
||||
//buffer.set_string(
|
||||
//area.x, main[2].y+1,
|
||||
//format!("╰{}╯", "─".repeat((area.width - 2) as usize)),
|
||||
//Style::default().black()
|
||||
//);
|
||||
|
||||
//Block::default()
|
||||
//.title("Sampler")
|
||||
//.borders(Borders::ALL)
|
||||
//.render(rows[2], buffer);
|
||||
|
||||
//Block::default()
|
||||
//.title("Mixer")
|
||||
//.borders(Borders::ALL)
|
||||
//.render(rows[3], buffer);
|
||||
|
||||
//Block::default()
|
||||
//.title("Looper")
|
||||
//.borders(Borders::ALL)
|
||||
//.render(rows[4], buffer);
|
||||
|
||||
|
||||
//let mut offset = (0, 0);
|
||||
//let (w, h) = render::render_toolbar_vertical(stdout, (offset.0, offset.1 + 1), &actions)?;
|
||||
//offset.0 = offset.0 + 20;
|
||||
|
||||
//transport::render(&mut state.transport, stdout, (offset.0 + 1, 1))?;
|
||||
//render::render_box(stdout, Some("Transport"), offset.0, 0, 70, 4,
|
||||
//state.mode == Mode::Transport)?;
|
||||
|
||||
//sequencer::render(&mut state.sequencer, stdout, (offset.0 + 1, 3))?;
|
||||
//render::render_box(stdout, Some("Sequencer"), offset.0, 5, 70, 6,
|
||||
//state.mode == Mode::Sequencer)?;
|
||||
|
||||
//sampler::render(&mut state.sampler, stdout, (offset.0 + 1, 10))?;
|
||||
//render::render_box(stdout, Some("Sampler"), offset.0, 12, 70, 4,
|
||||
//state.mode == Mode::Sampler)?;
|
||||
|
||||
//mixer::render(&mut state.mixer, stdout, (offset.0 + 1, 18))?;
|
||||
//render::render_box(stdout, Some("Mixer"), offset.0, 17, 70, 9,
|
||||
//state.mode == Mode::Mixer)?;
|
||||
|
||||
//looper::render(&mut state.looper, stdout, (offset.0 + 1, 28))?;
|
||||
//render::render_box(stdout, Some("Looper"), offset.0, 27, 70, 6,
|
||||
//state.mode == Mode::Looper)?;
|
||||
|
||||
//Ok(())
|
||||
self.transport.render(areas[0], buffer);
|
||||
for (index, device) in self.devices.iter().enumerate() {
|
||||
device.render(areas[index + 1], buffer);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -231,54 +130,20 @@ impl HandleInput for App {
|
|||
}
|
||||
},
|
||||
KeyCode::Tab => {
|
||||
match self.mode {
|
||||
Mode::Transport => self.mode = Mode::Sequencer,
|
||||
Mode::Sequencer => self.mode = Mode::Sampler,
|
||||
Mode::Sampler => self.mode = Mode::Mixer,
|
||||
Mode::Mixer => self.mode = Mode::Looper,
|
||||
Mode::Looper => self.mode = Mode::Transport,
|
||||
_ => {}
|
||||
};
|
||||
self.actions.clear();
|
||||
self.actions.extend_from_slice(&transport::ACTIONS);
|
||||
match self.mode {
|
||||
Mode::Transport => {},
|
||||
Mode::Mixer => self.actions.extend_from_slice(&mixer::ACTIONS),
|
||||
Mode::Looper => self.actions.extend_from_slice(&looper::ACTIONS),
|
||||
Mode::Sampler => self.actions.extend_from_slice(&sampler::ACTIONS),
|
||||
Mode::Sequencer => self.actions.extend_from_slice(&sequencer::ACTIONS),
|
||||
self.focus = self.focus + 1;
|
||||
if self.focus >= self.devices.len() {
|
||||
self.focus = 0;
|
||||
}
|
||||
},
|
||||
KeyCode::BackTab => {
|
||||
match self.mode {
|
||||
Mode::Transport => self.mode = Mode::Looper,
|
||||
Mode::Sequencer => self.mode = Mode::Transport,
|
||||
Mode::Sampler => self.mode = Mode::Sequencer,
|
||||
Mode::Mixer => self.mode = Mode::Sampler,
|
||||
Mode::Looper => self.mode = Mode::Mixer,
|
||||
_ => {}
|
||||
};
|
||||
self.actions.clear();
|
||||
self.actions.extend_from_slice(&transport::ACTIONS);
|
||||
match self.mode {
|
||||
Mode::Transport => {},
|
||||
Mode::Mixer => self.actions.extend_from_slice(&mixer::ACTIONS),
|
||||
Mode::Looper => self.actions.extend_from_slice(&looper::ACTIONS),
|
||||
Mode::Sampler => self.actions.extend_from_slice(&sampler::ACTIONS),
|
||||
Mode::Sequencer => self.actions.extend_from_slice(&sequencer::ACTIONS),
|
||||
if self.focus == 0 {
|
||||
self.focus = self.devices.len() - 1;
|
||||
} else {
|
||||
self.focus = self.focus - 1;
|
||||
}
|
||||
},
|
||||
_ => match self.mode {
|
||||
Mode::Transport => self.transport
|
||||
.handle(&event)?,
|
||||
Mode::Mixer => self.mixer
|
||||
.handle(&event)?,
|
||||
Mode::Looper => self.looper
|
||||
.handle(&event)?,
|
||||
Mode::Sampler => self.sampler
|
||||
.handle(&event)?,
|
||||
Mode::Sequencer => self.sequencers[0]
|
||||
.handle(&event)?,
|
||||
_ => {
|
||||
self.devices[self.focus].handle(&event)?
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue