mirror of
https://codeberg.org/unspeaker/tek.git
synced 2025-12-07 12:16:42 +01:00
0.2.2: don't crash on 't' key (thx @magicpotatobean)
This commit is contained in:
parent
46760bf8f0
commit
e7ec711a49
4 changed files with 16 additions and 16 deletions
14
Cargo.lock
generated
14
Cargo.lock
generated
|
|
@ -1510,7 +1510,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tek"
|
name = "tek"
|
||||||
version = "0.2.2"
|
version = "0.2.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"backtrace",
|
"backtrace",
|
||||||
"clap",
|
"clap",
|
||||||
|
|
@ -1529,7 +1529,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tek_cli"
|
name = "tek_cli"
|
||||||
version = "0.2.2"
|
version = "0.2.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"clap",
|
"clap",
|
||||||
"tek",
|
"tek",
|
||||||
|
|
@ -1537,14 +1537,14 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tek_jack"
|
name = "tek_jack"
|
||||||
version = "0.2.2"
|
version = "0.2.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"jack",
|
"jack",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tek_midi"
|
name = "tek_midi"
|
||||||
version = "0.2.2"
|
version = "0.2.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"midly",
|
"midly",
|
||||||
"tek_jack",
|
"tek_jack",
|
||||||
|
|
@ -1556,7 +1556,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tek_plugin"
|
name = "tek_plugin"
|
||||||
version = "0.2.2"
|
version = "0.2.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"livi",
|
"livi",
|
||||||
"tek_jack",
|
"tek_jack",
|
||||||
|
|
@ -1567,7 +1567,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tek_sampler"
|
name = "tek_sampler"
|
||||||
version = "0.2.2"
|
version = "0.2.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"symphonia",
|
"symphonia",
|
||||||
"tek_jack",
|
"tek_jack",
|
||||||
|
|
@ -1579,7 +1579,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tek_time"
|
name = "tek_time"
|
||||||
version = "0.2.2"
|
version = "0.2.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"atomic_float",
|
"atomic_float",
|
||||||
"tek_jack",
|
"tek_jack",
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
version = "0.2.2"
|
version = "0.2.3"
|
||||||
|
|
||||||
[workspace]
|
[workspace]
|
||||||
resolver = "2"
|
resolver = "2"
|
||||||
|
|
|
||||||
|
|
@ -80,6 +80,12 @@ expose!([self: Tek] {
|
||||||
Selection::Clip(0, s) => Selection::Scene(s),
|
Selection::Clip(0, s) => Selection::Scene(s),
|
||||||
Selection::Clip(t, s) => Selection::Clip(t - 1, s),
|
Selection::Clip(t, s) => Selection::Clip(t - 1, s),
|
||||||
},
|
},
|
||||||
|
":track-header" => match self.selected {
|
||||||
|
Selection::Mix => Selection::Mix,
|
||||||
|
Selection::Scene(s) => Selection::Mix,
|
||||||
|
Selection::Track(t) => Selection::Track((t + 1) % self.tracks.len()),
|
||||||
|
Selection::Clip(t, _) => Selection::Track((t + 1) % self.tracks.len()),
|
||||||
|
},
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -126,13 +132,6 @@ impose!([app: Tek] {
|
||||||
OutputCommand::try_from_expr(app, a).map(Self::Output))
|
OutputCommand::try_from_expr(app, a).map(Self::Output))
|
||||||
("select" [t: Selection]
|
("select" [t: Selection]
|
||||||
Some(t.map(Self::Select).expect("no selection")))
|
Some(t.map(Self::Select).expect("no selection")))
|
||||||
("select" [t: usize, s: usize]
|
|
||||||
Some(match (t.expect("no track"), s.expect("no scene")) {
|
|
||||||
(0, 0) => Self::Select(Selection::Mix),
|
|
||||||
(t, 0) => Self::Select(Selection::Track(t)),
|
|
||||||
(0, s) => Self::Select(Selection::Scene(s)),
|
|
||||||
(t, s) => Self::Select(Selection::Clip(t, s)),
|
|
||||||
}))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ClipCommand => {
|
ClipCommand => {
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@
|
||||||
(@shift-u redo 1)
|
(@shift-u redo 1)
|
||||||
(@space clock toggle)
|
(@space clock toggle)
|
||||||
(@shift-space clock toggle 0)
|
(@shift-space clock toggle 0)
|
||||||
(@t select :track 0)
|
|
||||||
(@tab edit :clip)
|
(@tab edit :clip)
|
||||||
(@c color)
|
(@c color)
|
||||||
(@q launch)
|
(@q launch)
|
||||||
|
|
@ -19,3 +18,5 @@
|
||||||
(@a select :track-prev)
|
(@a select :track-prev)
|
||||||
(@right select :track-next)
|
(@right select :track-next)
|
||||||
(@d select :track-next)
|
(@d select :track-next)
|
||||||
|
|
||||||
|
(@t select :track-header)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue