Skip to content

Commit 66a5a29

Browse files
FrostyCoolSlugFrostyCoolSlug
authored
Merge pull request #147 from GoXLR-on-Linux/dev-1.0.4
1.0.4
2 parents 982ac3c + 7f0ecb8 commit 66a5a29

File tree

25 files changed

+38
-148
lines changed

25 files changed

+38
-148
lines changed

‎audio/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "goxlr-audio"
3-
version = "1.0.3"
3+
version = "1.0.4"
44
edition = "2021"
55

66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -39,4 +39,4 @@ libpulse-simple-binding = "2.28.1"
3939
# Under Other Operating Systems, we'll use CPAL
4040
[target.'cfg(not(target_os = "linux"))'.dependencies]
4141
cpal = "0.15.2"
42-
rubato = "0.12.0"
42+
rubato = "=0.12.0"

‎audio/src/cpal/cpal_config.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ impl CpalConfiguration {
7373
for host_id in available_hosts {
7474
let host = cpal::host_from_id(host_id).unwrap();
7575
let devices = host.output_devices().unwrap();
76-
for (_device_index, device) in devices.enumerate() {
76+
for device in devices {
7777
list.push(format!("{}*{}", host_id.name(), device.name().unwrap()));
7878
}
7979
}
@@ -87,7 +87,7 @@ impl CpalConfiguration {
8787
for host_id in available_hosts {
8888
let host = cpal::host_from_id(host_id).unwrap();
8989
let devices = host.input_devices().unwrap();
90-
for (_device_index, device) in devices.enumerate() {
90+
for device in devices {
9191
list.push(format!("{}*{}", host_id.name(), device.name().unwrap()));
9292
}
9393
}

‎client/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "goxlr-client"
3-
version = "1.0.3"
3+
version = "1.0.4"
44
edition = "2021"
55
build = "build.rs"
66
authors = ["Nathan Adams <[email protected]>", "Craig McLure <[email protected]>", "Lars Mühlbauer <[email protected]>"]

‎daemon/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "goxlr-daemon"
3-
version = "1.0.3"
3+
version = "1.0.4"
44
edition = "2021"
55
authors = ["Nathan Adams <[email protected]>", "Craig McLure <[email protected]>", "Lars Mühlbauer <[email protected]>"]
66
description = "Allows control of a TC-Helicon GoXLR or GoXLR Mini, by maintaining an interaction with it over USB in the background."

‎daemon/src/profile.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1825,7 +1825,7 @@ impl ProfileAdapter {
18251825
bail!("Unable to find track");
18261826
}
18271827

1828-
pub fn track_to_audio(track: Track) -> AudioFile {
1828+
pub fn track_to_audio(track: &Track) -> AudioFile {
18291829
let mut gain = None;
18301830
let mut start_pct = None;
18311831
let mut stop_pct = None;
@@ -1844,7 +1844,7 @@ impl ProfileAdapter {
18441844

18451845
return AudioFile {
18461846
file: PathBuf::from(track.track()),
1847-
name: track.track,
1847+
name: track.track.clone(),
18481848
gain,
18491849
start_pct,
18501850
stop_pct,
@@ -2066,12 +2066,12 @@ impl ProfileAdapter {
20662066
index: usize,
20672067
percent: f32,
20682068
) -> Result<()> {
2069-
let mut track = self
2069+
let track = self
20702070
.profile
20712071
.settings_mut()
20722072
.sample_button_mut(standard_to_profile_sample_button(button))
20732073
.get_stack_mut(standard_to_profile_sample_bank(bank))
2074-
.get_track_by_index(index)?;
2074+
.get_track_by_index_mut(index)?;
20752075

20762076
track.set_start_position(percent)?;
20772077
Ok(())
@@ -2084,12 +2084,12 @@ impl ProfileAdapter {
20842084
index: usize,
20852085
percent: f32,
20862086
) -> Result<()> {
2087-
let mut track = self
2087+
let track = self
20882088
.profile
20892089
.settings_mut()
20902090
.sample_button_mut(standard_to_profile_sample_button(button))
20912091
.get_stack_mut(standard_to_profile_sample_bank(bank))
2092-
.get_track_by_index(index)?;
2092+
.get_track_by_index_mut(index)?;
20932093

20942094
track.set_end_position(percent)?;
20952095
Ok(())

‎daemon/web-content/css/app.edef27f0.css‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎daemon/web-content/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>GoXLR Utility</title><script defer="defer" src="/js/chunk-vendors.528c337c.js"></script><script defer="defer" src="/js/app.06617289.js"></script><link href="/css/app.c01cd29b.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but goxlr-ui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><canvas id="wheelCanvas" style="position: absolute; top: -1000px; left: -1000px; width: 130px; height: 130px"></canvas><div id="colourHover" style="position: absolute; top: -1000px; left: -1000px; width: 20px; height: 20px; border: 2px solid #fff; border-radius: 50%; box-shadow: 0 5px 10px rgba(0,0,0,0.5); background-color: #fff; pointer-events: none;"></div><div id="app"></div><script>window.onload = function(){
1+
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>GoXLR Utility</title><script defer="defer" src="/js/chunk-vendors.528c337c.js"></script><script defer="defer" src="/js/app.90306706.js"></script><link href="/css/app.c01cd29b.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but goxlr-ui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><canvas id="wheelCanvas" style="position: absolute; top: -1000px; left: -1000px; width: 130px; height: 130px"></canvas><div id="colourHover" style="position: absolute; top: -1000px; left: -1000px; width: 20px; height: 20px; border: 2px solid #fff; border-radius: 50%; box-shadow: 0 5px 10px rgba(0,0,0,0.5); background-color: #fff; pointer-events: none;"></div><div id="app"></div><script>window.onload = function(){
22
let canvas = document.getElementById('wheelCanvas');
33
let context = canvas.getContext('2d');
44
let img = new Image();

‎daemon/web-content/js/app.06617289.js‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎daemon/web-content/js/app.06617289.js.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎daemon/web-content/js/app.83a5f438.js‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)