Skip to content

Commit fd27807

Browse files
AldaronLauAldaronLau
committed
Version 0.5.0
1 parent 508cc73 commit fd27807

File tree

9 files changed

+89
-52
lines changed

9 files changed

+89
-52
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to `twang` will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://github.com/AldaronLau/semver).
66

7+
## [0.5.0] - 2020-12-19
8+
### Changed
9+
- Update `fon` to version 0.3
10+
711
## [0.4.0] - 2020-11-11
812
### Added
913
- Add `Room` struct for creating various types of reverb and echoes.

‎CONTRIBUTING.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Contributing
2+
Unless you explicitly state otherwise, any contribution intentionally submitted
3+
for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
4+
dual licensed under the Apache License, Version 2.0 and the Boost License,
5+
Version 1.0, without any additional terms or conditions.
6+
7+
Anyone is more than welcome to contribute! Don't be shy about getting involved,
8+
whether with a question, idea, bug report, bug fix, feature request, feature
9+
implementation, or other enhancement. Other projects have strict contributing
10+
guidelines, but this project accepts any and all formats for pull requests and
11+
issues. For ongoing code contributions, if you wish to ensure your code is
12+
used, open a draft PR so that I know not to write the same code. If a feature
13+
needs to be bumped in importance, I may merge an unfinished draft PR into it's
14+
own branch and finish it (after a week's deadline for the person who openned
15+
it). Contributors will always be notified in this situation, and given a choice
16+
to merge early.
17+
18+
All pull request contributors will have their username added in the contributors
19+
section of the release notes of the next version after the merge, with a message
20+
thanking them. I always make time to fix bugs, so usually a patched version of
21+
the library will be out a few days after a report. Features requests will not
22+
complete as fast. If you have any questions, design critques, or want me to
23+
find you something to work on based on your skill level, you can email me at
24+
[[email protected]](mailto:[email protected]). Otherwise,
25+
[here's a link to the issues on GitHub](https://github.com/AldaronLau/twang/issues),
26+
and, as always, make sure to read and follow the
27+
[Code of Conduct](https://github.com/AldaronLau/twang/blob/main/CODE_OF_CONDUCT.md).

‎Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
[package]
1212
name = "twang"
13-
version = "0.4.0"
13+
version = "0.5.0"
1414
authors = ["Jeron Aldaron Lau <[email protected]>"]
15-
license = "MIT OR Apache-2.0 OR Zlib"
15+
license = "Apache-2.0 OR BSL-1.0"
1616
documentation = "https://docs.rs/twang"
1717
homepage = "https://github.com/AldaronLau/twang"
1818
repository = "https://github.com/AldaronLau/twang"
@@ -23,7 +23,7 @@ categories = ["multimedia::audio", "multimedia"]
2323
edition = "2018"
2424

2525
[dependencies]
26-
fon = { path = "../fon" } # "0.2"
26+
fon = "0.3"
2727

2828
# [replace]
2929
# "fon:0.2.0" = { path = "../fon" }

‎LICENSE-MIT

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

‎LICENSE-ZLIB

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

‎LICENSE-APACHE renamed to ‎LICENSE_APACHE_2_0.txt

File renamed without changes.

‎LICENSE_BOOST_1_0.txt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
Boost Software License - Version 1.0 - August 17th, 2003
2+
3+
Permission is hereby granted, free of charge, to any person or organization
4+
obtaining a copy of the software and accompanying documentation covered by
5+
this license (the "Software") to use, reproduce, display, distribute,
6+
execute, and transmit the Software, and to prepare derivative works of the
7+
Software, and to permit third-parties to whom the Software is furnished to
8+
do so, all subject to the following:
9+
10+
The copyright notices in the Software and this entire statement, including
11+
the above license grant, this restriction and the following disclaimer,
12+
must be included in all copies of the Software, in whole or in part, and
13+
all derivative works of the Software, unless such copies or derivative
14+
works are solely in the form of machine-executable object code generated by
15+
a source language processor.
16+
17+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
20+
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
21+
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
22+
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23+
DEALINGS IN THE SOFTWARE.

‎README.md

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,17 +104,39 @@ Examples can be found in the [Documentation](https://docs.rs/twang) and the
104104
examples folder.
105105

106106
## License
107-
The `twang` crate is distributed under any of
108-
109-
- The terms of the
110-
[MIT License](https://github.com/AldaronLau/twang/blob/master/LICENSE-MIT)
111-
- The terms of the
112-
[Apache License (Version 2.0)](https://github.com/AldaronLau/twang/blob/master/LICENSE-APACHE)
113-
- The terms of the
114-
[Zlib License](https://github.com/AldaronLau/twang/blob/master/LICENSE-ZLIB)
107+
Licensed under either of
108+
- Apache License, Version 2.0
109+
([LICENSE_APACHE_2_0.txt](https://github.com/AldaronLau/twang/blob/main/LICENSE_APACHE_2_0.txt) or
110+
[https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0))
111+
- Boost License, Version 1.0
112+
([LICENSE_BOOST_1_0.txt](https://github.com/AldaronLau/twang/blob/main/LICENSE_BOOST_1_0.txt) or
113+
[https://www.boost.org/LICENSE_1_0.txt](https://www.boost.org/LICENSE_1_0.txt))
115114

116115
at your option.
117116

117+
### Contribution
118118
Unless you explicitly state otherwise, any contribution intentionally submitted
119119
for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
120-
licensed as described above, without any additional terms or conditions.
120+
dual licensed as above, without any additional terms or conditions.
121+
122+
Anyone is more than welcome to contribute! Don't be shy about getting involved,
123+
whether with a question, idea, bug report, bug fix, feature request, feature
124+
implementation, or other enhancement. Other projects have strict contributing
125+
guidelines, but this project accepts any and all formats for pull requests and
126+
issues. For ongoing code contributions, if you wish to ensure your code is
127+
used, open a draft PR so that I know not to write the same code. If a feature
128+
needs to be bumped in importance, I may merge an unfinished draft PR into it's
129+
own branch and finish it (after a week's deadline for the person who openned
130+
it). Contributors will always be notified in this situation, and given a choice
131+
to merge early.
132+
133+
All pull request contributors will have their username added in the contributors
134+
section of the release notes of the next version after the merge, with a message
135+
thanking them. I always make time to fix bugs, so usually a patched version of
136+
the library will be out a few days after a report. Features requests will not
137+
complete as fast. If you have any questions, design critques, or want me to
138+
find you something to work on based on your skill level, you can email me at
139+
[[email protected]](mailto:[email protected]). Otherwise,
140+
[here's a link to the issues on GitHub](https://github.com/AldaronLau/twang/issues),
141+
and, as always, make sure to read and follow the
142+
[Code of Conduct](https://github.com/AldaronLau/twang/blob/main/CODE_OF_CONDUCT.md).

‎examples/wav/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//!
33
//! http://www-mmsp.ece.mcgill.ca/Documents/AudioFormats/WAVE/WAVE.html
44
5-
use fon::{chan::Ch16, sample::Sample, stereo::Stereo16, Audio};
5+
use fon::{chan::Ch16, Sample, stereo::Stereo16, Audio};
66
use std::convert::TryInto;
77
use std::{fs, io, mem::size_of};
88

0 commit comments

Comments
 (0)