Skip to content

Commit 528137e

Browse files
committed
chore: update cpal to latest Git, fix conflict
1 parent d89514d commit 528137e

File tree

3 files changed

+126
-24
lines changed

3 files changed

+126
-24
lines changed

Cargo.lock

Lines changed: 125 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ all-features = true
103103
rustdoc-args = ["--cfg", "docsrs"]
104104

105105
[dependencies]
106-
cpal = { version = "0.16", optional = true }
106+
cpal = { git = "https://github.com/RustAudio/cpal", rev = "c9d8e2e18789e305e2d087d65888f06db08bd2ba", optional = true }
107107
dasp_sample = "0.11.0"
108108
claxon = { version = "0.4.2", optional = true }
109109
hound = { version = "3.5", optional = true }

src/microphone.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,6 @@ pub struct Input {
130130
inner: cpal::Device,
131131
}
132132

133-
impl From<Input> for cpal::Device {
134-
fn from(val: Input) -> Self {
135-
val.inner
136-
}
137-
}
138-
139133
impl fmt::Debug for Input {
140134
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
141135
f.debug_struct("Device")

0 commit comments

Comments
 (0)