Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
# Conflicts:
#	Package.resolved
  • Loading branch information
aure committed Apr 19, 2022
2 parents 73b438e + a891477 commit d1a69dc
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

Try to make sure your changes conform to the [Swift API Design Guidelines](https://swift.org/documentation/api-design-guidelines/). If you have 40 minutes you'd like to have well-spent, watch [Modern Swift API Design](https://developer.apple.com/videos/play/wwdc2019/415/) from WWDC 2019.

Ready to send us a pull request? Please make sure your request is based on the a `develop` branch of the repository since `main` should only hold stable releases.
Ready to send us a pull request? Please make sure your request is based on the `develop` branch of the repository since `main` should only hold stable releases.
8 changes: 4 additions & 4 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
"repositoryURL": "https://github.com/AudioKit/AudioKit",
"state": {
"branch": null,
"revision": "8c19f5e377d00603ecb8f2af30b7e9dd96d05a95",
"version": "5.3.1"
"revision": "110d2dfa0b798f76349922fdd1d23d660a16dc37",
"version": "5.4.0"
}
},
{
"package": "AudioKitEX",
"repositoryURL": "https://github.com/AudioKit/AudioKitEX",
"state": {
"branch": null,
"revision": "0e171a63cf225b587fc8ce797b42249076453643",
"version": "5.3.1"
"revision": "b66fb1e2922611ac0c5a7ac5bbe2731f9b5ce38b",
"version": "5.4.0"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ let package = Package(
products: [.library(name: "SoundpipeAudioKit", targets: ["SoundpipeAudioKit"])],
dependencies: [
.package(url: "https://github.com/AudioKit/KissFFT", from: "1.0.0"),
.package(url: "https://github.com/AudioKit/AudioKit", from: "5.3.0"),
.package(url: "https://github.com/AudioKit/AudioKitEX", from: "5.3.0"),
.package(url: "https://github.com/AudioKit/AudioKit", from: "5.4.0"),
.package(url: "https://github.com/AudioKit/AudioKitEX", from: "5.4.0"),
],
targets: [
.target(name: "Soundpipe",
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ You can AudioKit and any of the other AudioKit libraries using Collections
|--------------------|-------------------------------------------------------------|---------------|
| SoundpipeAudioKit | API for using Soundpipe-powered Audio Units | Swift |
| CSoundpipeAudioKit | Audio Units for the Soundpipe DSP | Objective-C++ |
| Soundpipe | Low-level DSP for oscillators, physcial models, and effects | C |
| Soundpipe | Low-level DSP for oscillators, physical models, and effects | C |

## Generators / Instruments

Expand Down
2 changes: 1 addition & 1 deletion Sources/Soundpipe/modules/foo.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ int sp_foo_destroy(sp_foo **p)

int sp_foo_init(sp_data *sp, sp_foo *p)
{
/* Initalize variables here. */
/* Initialize variables here. */
p->bar = 123;
return SP_OK;
}
Expand Down
4 changes: 2 additions & 2 deletions Sources/Soundpipe/modules/ftbl.c
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ int sp_gen_line(sp_data *sp, sp_ftbl *ft, const char *argstring)
y2 = args->tbl[i + 1];

if(x2 < x1) {
fprintf(stderr, "Error: x coordiates must be sequential!\n");
fprintf(stderr, "Error: x coordinates must be sequential!\n");
break;
}

Expand Down Expand Up @@ -215,7 +215,7 @@ int sp_gen_xline(sp_data *sp, sp_ftbl *ft, const char *argstring)
y2 = args->tbl[i + 1];

if(x2 < x1) {
fprintf(stderr, "Error: x coordiates must be sequential!\n");
fprintf(stderr, "Error: x coordinates must be sequential!\n");
break;
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/Soundpipe/modules/mincer.c
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ int sp_mincer_compute(sp_data *sp, sp_mincer *p, SPFLOAT *in2, SPFLOAT *out)

/* window it */
fwin[i] = insig * win[i];
/* back windo, bwin */
/* back window, bwin */
post = (int) (pos - hsize*pitch);
post *= 1;
post += 0;
Expand Down
2 changes: 1 addition & 1 deletion Sources/Soundpipe/modules/randi.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ int sp_randi_init(sp_data *sp, sp_randi *p)
p->num2 = sp_randGab;
p->dfdmax = (p->num2 - p->num1) / SP_FT_MAXLEN * 1.0;
break;
default: /* old behaviour as developped by Gabriel */
default: /* old behaviour as developed by Gabriel */
p->num1 = p->num2 = 0.0;
p->dfdmax = 0.0;
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/Soundpipe/modules/thresh.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ int sp_thresh_destroy(sp_thresh **p)

int sp_thresh_init(sp_data *sp, sp_thresh *p)
{
/* Initalize variables here. */
/* Initialize variables here. */
p->init = 1;
p->mode = 0;
p->prev = 0;
Expand Down
4 changes: 2 additions & 2 deletions Sources/Soundpipe/modules/wpkorg35.c
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* WPKorg35
*
* This is a filter based off of an implemenation the Korg35 filter by Will
* Pirke. It has been ported from the CCRMA chugin by the same name.
* This is a filter based off of an implementation of the Korg35 filter
* by Will Pirke. It has been ported from the CCRMA chugin by the same name.
*
*/

Expand Down
2 changes: 1 addition & 1 deletion Sources/SoundpipeAudioKit/Effects/ChowningReverb.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import AudioKit
import AudioKitEX
import CAudioKitEX

/// This is was built using the JC reverb implentation found in FAUST.
/// This is was built using the JC reverb implementation found in FAUST.
/// According to the source code, the specifications for this implementation were
/// found on an old SAIL DART backup tape.
///
Expand Down
6 changes: 3 additions & 3 deletions Sources/SoundpipeAudioKit/Effects/FormantFilter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ public class FormantFilter: Node {
/// Specification details for decayDuration
public static let decayDurationDef = NodeParameterDef(
identifier: "decayDuration",
name: "Impulse reponse decay time (Seconds)",
name: "Impulse response decay time (Seconds)",
address: akGetParameterAddress("FormantFilterParameterDecayDuration"),
defaultValue: 0.04,
range: 0.0 ... 0.1,
unit: .seconds)

/// Impulse reponse decay time (in seconds)
/// Impulse response decay time (in seconds)
@Parameter(decayDurationDef) public var decayDuration: AUValue

// MARK: - Initialization
Expand All @@ -65,7 +65,7 @@ public class FormantFilter: Node {
/// - input: Input node to process
/// - centerFrequency: Center frequency.
/// - attackDuration: Impulse response attack time (in seconds).
/// - decayDuration: Impulse reponse decay time (in seconds)
/// - decayDuration: Impulse response decay time (in seconds)
///
public init(
_ input: Node,
Expand Down
2 changes: 1 addition & 1 deletion Sources/SoundpipeAudioKit/PitchTap.swift
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public class PitchTap: BaseTap {
}
}

/// Overide this method to handle Tap in derived class
/// Override this method to handle Tap in derived class
/// - Parameters:
/// - buffer: Buffer to analyze
/// - time: Unused in this case
Expand Down

0 comments on commit d1a69dc

Please sign in to comment.