Azorlogh/tunefire - Change 6GZTCB6VJEBACZR2KCGIXBOQ3JFHTBJQJNPAGQNNWQFDB6VRFEUAC

replace dasp by rubato

Created by 3pZwLy8tqk9sUDM8DL89shmmk6PKLrXyyxzvpu4iA6hQ on June 25, 2022

6GZTCB6VJEBACZR2KCGIXBOQ3JFHTBJQJNPAGQNNWQFDB6VRFEUAC

Dependencies

In channels

main

Change contents

File deletion: player.rs

BF:BFD[3.38] → [3.9833:9866]

BF:BFD[3.9866] → [3.9867:9867]

B:BD[3.9867] → [3.9868:9918]

B:BD[3.9918] → [3.9918:10077]

B:BD[3.10077] → [3.10077:10078]

B:BD[3.10078] → [3.10078:10116]

B:BD[3.10116] → [3.10116:10173]

B:BD[3.10173] → [3.10173:10193]

B:BD[3.10193] → [3.10193:10340]

B:BD[3.10340] → [3.10340:10442]

B:BD[3.10442] → [3.10442:10668]

B:BD[3.10668] → [3.10668:11006]

B:BD[3.11006] → [3.11006:11088]

B:BD[3.11088] → [3.11088:11138]

B:BD[3.11138] → [3.11138:11354]

B:BD[3.11354] → [3.11354:11365]

B:BD[3.11365] → [3.11365:11369]

B:BD[3.11369] → [3.11369:11446]

B:BD[3.11446] → [3.11446:11562]

B:BD[3.11562] → [3.11562:11573]

B:BD[3.11573] → [3.11573:11584]

B:BD[3.11584] → [3.11584:11593]

use std::time::Duration;
use cpal::StreamConfig;
use dasp::{
	frame::Stereo,
	interpolate::sinc::Sinc,
	ring_buffer,
	signal::{interpolate::Converter, IntoInterleavedSamples},
	Signal,
};
use crate::Source;
const INTERPOLATOR_SIZE: usize = 100;
pub enum Event {
	Play,
	Pause,
	Stop,
	Seek(Duration),
	SetSource(Source),
}
pub struct Player {
	receiver: crossbeam_channel::Receiver<Event>,
	config: StreamConfig,
	playing: bool,
	_duration: Duration,
	position: f64,
	source:
		Option<IntoInterleavedSamples<Converter<Source, Sinc<[Stereo<f32>; INTERPOLATOR_SIZE]>>>>,
}
impl Player {
	pub fn new(config: StreamConfig, receiver: crossbeam_channel::Receiver<Event>) -> Self {
		Self {
			receiver,
			config,
			playing: false,
			_duration: Duration::SECOND,
			position: 0.0,
			source: None,
		}
	}
	pub fn process_events(&mut self) {
		while let Ok(event) = self.receiver.try_recv() {
			match event {
				Event::Play => self.playing = true,
				Event::Pause => self.playing = false,
				Event::Stop => self.playing = false,
				Event::Seek(position) => self.position = position.as_secs_f64(),
				Event::SetSource(source) => {
					let ring_buffer = ring_buffer::Fixed::from([[0.0, 0.0]; INTERPOLATOR_SIZE]);
					let source_sample_rate = source.sample_rate;
					self.source = Some(
						source
							.from_hz_to_hz(
								Sinc::new(ring_buffer),
								source_sample_rate,
								self.config.sample_rate.0 as f64,
							)
							.into_interleaved_samples(),
					);
				}
			}
		}
	}
	pub fn process(&mut self, data: &mut [f32]) {
		self.process_events();
		match &mut self.source {
			Some(source) if self.playing => {
				for d in data {
					*d = source.next_sample();
				}
			}
			_ => {}
		}
	}
}

Replacement in tf-player/src/plugins/soundcloud/mod.rs at line 7 [3.116]

B:BD[3.394] → [3.394:452]

use crate::{LocalSource, SongInfo, Source, SourcePlugin};

[3.394]

[3.452]

use crate::{LocalSource, SongInfo, SongSource, SourcePlugin};

Replacement in tf-player/src/plugins/soundcloud/mod.rs at line 43 [3.116]
B:BD[2.118] → [2.118:171]
```
	pub fn handle(&self, url: &Url) -> Result<Source> {
```
[2.118]
[2.171]
```
	pub fn handle(&self, url: &Url) -> Result<SongSource> {
```

Replacement in tf-player/src/plugins/soundcloud/mod.rs at line 88 [3.116]

B:BD[4.160] → [2.1333:1397]

		let source = LocalSource::from_mss(mss).map(|source| Source {

[4.160]

[2.1397]

		let source = LocalSource::from_mss(mss).map(|source| SongSource {

Replacement in tf-player/src/plugins/soundcloud/mod.rs at line 105 [3.116]

B:BD[4.310] → [2.1635:1696]

	fn handle_url(&self, url: &Url) -> Option<Result<Source>> {

[4.310]

[2.1696]

	fn handle_url(&self, url: &Url) -> Option<Result<SongSource>> {

Deletion in tf-player/src/plugins/local.rs at line 4 [3.5500]
B:BD[3.5571] → [3.5571:5606]
```
use dasp::{frame::Stereo, Signal};
```

Replacement in tf-player/src/plugins/local.rs at line 13 [3.5500]

B:BD[3.5767] → [3.5767:5820]

use crate::{plugin::SongInfo, Source, SourcePlugin};

[3.5767]

[3.5820]

use crate::{plugin::SongInfo, SongSource, Source, SourcePlugin};

Replacement in tf-player/src/plugins/local.rs at line 22 [3.5500]

B:BD[3.5930] → [3.5930:5991]

	fn handle_url(&self, url: &Url) -> Option<Result<Source>> {

[3.5930]

[3.5991]

	fn handle_url(&self, url: &Url) -> Option<Result<SongSource>> {

Replacement in tf-player/src/plugins/local.rs at line 25 [3.5500]

B:BD[3.6063] → [3.6063:6131]

				let source = LocalSource::from_file(path).map(|source| Source {

[3.6063]

[3.6131]

				let source = LocalSource::from_file(path).map(|source| SongSource {

Insertion in tf-player/src/plugins/local.rs at line 104 [3.5500]
[3.7910]
[3.7910]
```
	fn handle_messages(&mut self) {}
```
Insertion in tf-player/src/plugins/local.rs at line 108 [3.5500]
[3.7940]
[3.7940]
```
		self.handle_messages();
```

Deletion in tf-player/src/plugins/local.rs at line 139 [3.5500]

B:BD[3.8543] → [3.8543:8652]


impl Signal for LocalSource {
	type Frame = Stereo<f32>;
	fn is_exhausted(&self) -> bool {
		self.ended
	}

Replacement in tf-player/src/plugins/local.rs at line 140 [3.5500]
B:BD[3.8653] → [3.8653:8690]
```
	fn next(&mut self) -> Self::Frame {
```
[3.8653]
[2.2041]
```
impl Source for LocalSource {
	fn next(&mut self, buf: &mut [[f32; 2]]) {
```
Replacement in tf-player/src/plugins/local.rs at line 143 [3.5500]
∅:D[2.2073] → [3.8708:8730]
B:BD[3.8708] → [3.8708:8730]
```
			return [0.0, 0.0];
```
[2.2073]
[3.8730]
```
			return;
```

Replacement in tf-player/src/plugins/local.rs at line 145 [3.5500]

B:BD[3.8734] → [3.8734:8960]

		let frame = [
			self.sample_buf.samples()[(self.i + 0) as usize],
			self.sample_buf.samples()[(self.i + 1) as usize],
		];
		self.i += 2;
		if self.i == self.sample_buf.len() as u32 {
			self.decode_next();
			self.i = 0;

[3.8734]

[3.8960]

		for b in buf {
			b[0] = self.sample_buf.samples()[(self.i + 0) as usize];
			b[1] = self.sample_buf.samples()[(self.i + 1) as usize];
			self.i += 2;
			if self.i == self.sample_buf.len() as u32 {
				self.decode_next();
				self.i = 0;
			}

Deletion in tf-player/src/plugins/local.rs at line 154 [3.5500]
B:BD[3.8964] → [3.8964:8972]
```
		frame
```

Insertion in tf-player/src/plugins/local.rs at line 156 [3.5500]

[3.8977]


// impl Signal for LocalSource {
// 	type Frame = Stereo<f32>;
// 	fn is_exhausted(&self) -> bool {
// 		self.ended
// 	}
// 	fn next(&mut self) -> Self::Frame {
// 		if self.empty || self.ended {
// 			return [0.0, 0.0];
// 		}
// 		let frame = [
// 			self.sample_buf.samples()[(self.i + 0) as usize],
// 			self.sample_buf.samples()[(self.i + 1) as usize],
// 		];
// 		self.i += 2;
// 		if self.i == self.sample_buf.len() as u32 {
// 			self.decode_next();
// 			self.i = 0;
// 		}
// 		frame
// 	}
// }

Deletion in tf-player/src/plugin.rs at line 4 [3.9012]
B:BD[3.9059] → [5.82:125]
```
use dasp::{frame::Stereo, signal::Signal};
```

Deletion in tf-player/src/plugin.rs at line 5 [3.9012]

B:BD[3.9125] → [3.9125:9356]


// pub trait Source: Send {
// 	fn sample_rate(&self) -> f64;
// 	fn next(&mut self) -> [f32; 2];
// }
// impl<T: Source> Signal for T {
// 	type Frame = Stereo<f32>;
// 	fn next(&mut self) -> f32 {
// 		self.next()
// 	}
// }

Deletion in tf-player/src/plugin.rs at line 6 [3.9012]
B:BD[3.9357] → [3.9357:9427]
```
pub type SourceSignal = Box<dyn Signal<Frame = Stereo<f32>> + Send>;
```
Replacement in tf-player/src/plugin.rs at line 11 [3.9012]
B:BD[3.9500] → [3.9500:9520]
```
pub struct Source {
```
[3.9500]
[3.9520]
```
pub struct SongSource {
```
Replacement in tf-player/src/plugin.rs at line 13 [3.9012]
B:BD[3.9543] → [3.9543:9570]
```
	pub signal: SourceSignal,
```
[3.9543]
[3.9570]
```
	pub signal: Box<dyn Source>,
```

Replacement in tf-player/src/plugin.rs at line 17 [3.9012]

B:BD[3.9594] → [3.9594:9708]

impl Signal for Source {
	type Frame = Stereo<f32>;
	fn next(&mut self) -> Self::Frame {
		self.signal.next()
	}

[3.9594]

[3.9708]

pub trait Source: Send {
	fn next(&mut self, buf: &mut [[f32; 2]]);

Replacement in tf-player/src/plugin.rs at line 24 [3.9012]

B:BD[3.9770] → [3.9770:9830]

	fn handle_url(&self, url: &Url) -> Option<Result<Source>>;

[3.9770]

[3.9830]

	fn handle_url(&self, url: &Url) -> Option<Result<SongSource>>;

Insertion in tf-player/src/lib.rs at line 2 [3.11625]
[3.11658]
[3.11658]
```
#![feature(array_chunks)]
```
Deletion in tf-player/Cargo.toml at line 16 [3.15663]
B:BD[3.15947] → [3.15947:15966]
```
# claxon = "0.4.3"
```

Replacement in tf-player/Cargo.toml at line 18 [3.15663]

B:BD[3.16010] → [3.16010:16133]

dasp = { git = "https://github.com/RustAudio/dasp", features=["signal", "ring_buffer", "interpolate", "interpolate-sinc"]}

[3.16010]

[3.16133]

rubato = "0.12.0"

Deletion in Cargo.lock at line 561 [3.60003]

B:BD[3.73673] → [3.73673:74632]

]
[[package]]
name = "dasp"
version = "0.11.0"
source = "git+https://github.com/RustAudio/dasp#66e8b83a5c926fde3ec7feab5dbe5982e6ce7b81"
dependencies = [
 "dasp_envelope",
 "dasp_frame",
 "dasp_interpolate",
 "dasp_peak",
 "dasp_ring_buffer",
 "dasp_rms",
 "dasp_sample",
 "dasp_signal",
 "dasp_slice",
 "dasp_window",
]
[[package]]
name = "dasp_envelope"
version = "0.11.0"
source = "git+https://github.com/RustAudio/dasp#66e8b83a5c926fde3ec7feab5dbe5982e6ce7b81"
dependencies = [
 "dasp_frame",
 "dasp_peak",
 "dasp_ring_buffer",
 "dasp_rms",
 "dasp_sample",
]
[[package]]
name = "dasp_frame"
version = "0.11.0"
source = "git+https://github.com/RustAudio/dasp#66e8b83a5c926fde3ec7feab5dbe5982e6ce7b81"
dependencies = [
 "dasp_sample",
]
[[package]]
name = "dasp_interpolate"
version = "0.11.0"
source = "git+https://github.com/RustAudio/dasp#66e8b83a5c926fde3ec7feab5dbe5982e6ce7b81"
dependencies = [
 "dasp_frame",
 "dasp_ring_buffer",
 "dasp_sample",

Deletion in Cargo.lock at line 564 [3.60003]

B:BD[3.74647] → [3.74647:76006]

name = "dasp_peak"
version = "0.11.0"
source = "git+https://github.com/RustAudio/dasp#66e8b83a5c926fde3ec7feab5dbe5982e6ce7b81"
dependencies = [
 "dasp_frame",
 "dasp_sample",
]
[[package]]
name = "dasp_ring_buffer"
version = "0.11.0"
source = "git+https://github.com/RustAudio/dasp#66e8b83a5c926fde3ec7feab5dbe5982e6ce7b81"
[[package]]
name = "dasp_rms"
version = "0.11.0"
source = "git+https://github.com/RustAudio/dasp#66e8b83a5c926fde3ec7feab5dbe5982e6ce7b81"
dependencies = [
 "dasp_frame",
 "dasp_ring_buffer",
 "dasp_sample",
]
[[package]]
name = "dasp_sample"
version = "0.11.0"
source = "git+https://github.com/RustAudio/dasp#66e8b83a5c926fde3ec7feab5dbe5982e6ce7b81"
[[package]]
name = "dasp_signal"
version = "0.11.0"
source = "git+https://github.com/RustAudio/dasp#66e8b83a5c926fde3ec7feab5dbe5982e6ce7b81"
dependencies = [
 "dasp_envelope",
 "dasp_frame",
 "dasp_interpolate",
 "dasp_peak",
 "dasp_ring_buffer",
 "dasp_rms",
 "dasp_sample",
 "dasp_window",
]
[[package]]
name = "dasp_slice"
version = "0.11.0"
source = "git+https://github.com/RustAudio/dasp#66e8b83a5c926fde3ec7feab5dbe5982e6ce7b81"
dependencies = [
 "dasp_frame",
 "dasp_sample",
]
[[package]]
name = "dasp_window"
version = "0.11.0"
source = "git+https://github.com/RustAudio/dasp#66e8b83a5c926fde3ec7feab5dbe5982e6ce7b81"
dependencies = [
 "dasp_sample",
]
[[package]]

Insertion in Cargo.lock at line 1478 [3.60003]

[3.97606]

]
[[package]]
name = "num-complex"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19"
dependencies = [
 "num-traits",

Insertion in Cargo.lock at line 1501 [3.60003]

[3.97868]

name = "num-integer"
version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
dependencies = [
 "autocfg",
 "num-traits",
]
[[package]]

Insertion in Cargo.lock at line 1820 [3.60003]

[3.105200]

name = "primal-check"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01419cee72c1a1ca944554e23d83e483e1bccf378753344e881de28b5487511d"
dependencies = [
 "num-integer",
]
[[package]]

Insertion in Cargo.lock at line 1893 [3.60003]

[3.106872]

]
[[package]]
name = "realfft"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a83b876fe55da7e1bf5deeacb93d6411edf81eba0e1a497e79c067734729053a"
dependencies = [
 "rustfft",

Insertion in Cargo.lock at line 1943 [3.60003]

[3.107837]

]
[[package]]
name = "rubato"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd70209c27d5b08f5528bdc779ea3ffb418954e28987f9f9775c6eac41003f9c"
dependencies = [
 "num-complex",
 "num-integer",
 "num-traits",
 "realfft",

Insertion in Cargo.lock at line 1997 [3.60003]

[3.108849]

name = "rustfft"
version = "6.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1d089e5c57521629a59f5f39bca7434849ff89bd6873b521afe389c1c602543"
dependencies = [
 "num-complex",
 "num-integer",
 "num-traits",
 "primal-check",
 "strength_reduce",
 "transpose",
]
[[package]]

Insertion in Cargo.lock at line 2183 [3.60003]

[3.113386]


[[package]]
name = "strength_reduce"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3ff2f71c82567c565ba4b3009a9350a96a7269eaa4001ebedae926230bc2254"

Deletion in Cargo.lock at line 2442 [3.60003]
B:BD[3.118915] → [3.118915:118924]
```
 "dasp",
```
Insertion in Cargo.lock at line 2445 [3.60003]
[3.118947]
[3.118947]
```
 "rubato",
```

Insertion in Cargo.lock at line 2579 [3.60003]

[3.122149]

name = "transpose"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95f9c900aa98b6ea43aee227fd680550cdec726526aab8ac801549eadb25e39f"
dependencies = [
 "num-integer",
 "strength_reduce",
]
[[package]]

replace dasp by rubato

Dependencies

In channels

Change contents

File deletion: player.rs

Replacement in tf-player/src/plugins/soundcloud/mod.rs at line 7 [3.116]

Replacement in tf-player/src/plugins/soundcloud/mod.rs at line 43 [3.116]

Replacement in tf-player/src/plugins/soundcloud/mod.rs at line 88 [3.116]

Replacement in tf-player/src/plugins/soundcloud/mod.rs at line 105 [3.116]

Deletion in tf-player/src/plugins/local.rs at line 4 [3.5500]

Replacement in tf-player/src/plugins/local.rs at line 13 [3.5500]

Replacement in tf-player/src/plugins/local.rs at line 22 [3.5500]

Replacement in tf-player/src/plugins/local.rs at line 25 [3.5500]

Insertion in tf-player/src/plugins/local.rs at line 104 [3.5500]

Insertion in tf-player/src/plugins/local.rs at line 108 [3.5500]

Deletion in tf-player/src/plugins/local.rs at line 139 [3.5500]

Replacement in tf-player/src/plugins/local.rs at line 140 [3.5500]

Replacement in tf-player/src/plugins/local.rs at line 143 [3.5500]

Replacement in tf-player/src/plugins/local.rs at line 145 [3.5500]

Deletion in tf-player/src/plugins/local.rs at line 154 [3.5500]

Insertion in tf-player/src/plugins/local.rs at line 156 [3.5500]

Deletion in tf-player/src/plugin.rs at line 4 [3.9012]

Deletion in tf-player/src/plugin.rs at line 5 [3.9012]

Deletion in tf-player/src/plugin.rs at line 6 [3.9012]

Replacement in tf-player/src/plugin.rs at line 11 [3.9012]

Replacement in tf-player/src/plugin.rs at line 13 [3.9012]