Skip to content

Commit

Permalink
Update links and Cargo.toml
Browse files Browse the repository at this point in the history
  • Loading branch information
AldaronLau committed Aug 28, 2022
1 parent 8198c39 commit 44879aa
Show file tree
Hide file tree
Showing 15 changed files with 38 additions and 128 deletions.
10 changes: 9 additions & 1 deletion .rustfmt.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
# Don't deviate too much, just reduce columns and stricter enforcement
edition = "2021"
unstable_features = true
max_width = 80
use_field_init_shorthand = true
reorder_impl_items = true
group_imports = "StdExternalCrate"
imports_granularity = "Crate"
newline_style = "Unix"
normalize_doc_attributes = true
wrap_comments = true
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://jeronlau.tk/semver/).
### Changed
- Update to pasts 0.12.0
- Replace `supports()` with `config()`
- Bumped to 2021 edition

### Removed
- `Speakers::play()` - use `Notifier` impl on `Speakers` instead
Expand Down
76 changes: 0 additions & 76 deletions CODE_OF_CONDUCT.md

This file was deleted.

22 changes: 0 additions & 22 deletions CONTRIBUTING.md

This file was deleted.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@

[package]
name = "wavy"
version = "0.9.1"
version = "0.10.0"
license = "Apache-2.0 OR BSL-1.0 OR MIT"

description = """
Asynchronous cross-platform real-time audio recording & playback.
"""
repository = "https://github.com/libcala/wavy"
repository = "https://github.com/ardaku/wavy"
documentation = "https://docs.rs/wavy"
homepage = "https://github.com/libcala/wavy/blob/main/CHANGELOG.md"
homepage = "https://github.com/ardaku/wavy/blob/stable/CHANGELOG.md"
include = ["Cargo.toml", "src/*"]
categories = [
"game-engines", "hardware-support", "multimedia", "multimedia::audio", "os"
]
keywords = ["audio", "realtime", "cross-platform", "record", "play"]
readme = "README.md"
edition = "2018"
edition = "2021"

# For all platforms
[dependencies.fon]
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#### [Changelog][3] | [Source][4] | [Getting Started][5]

[![tests](https://github.com/libcala/wavy/workflows/tests/badge.svg)][2]
[![tests](https://github.com/ardaku/wavy/workflows/tests/badge.svg)][2]
[![docs](https://docs.rs/wavy/badge.svg)][0]
[![crates.io](https://img.shields.io/crates/v/wavy.svg)][1]

Expand Down Expand Up @@ -45,15 +45,15 @@ email at [[email protected]][13].

[0]: https://docs.rs/wavy
[1]: https://crates.io/crates/wavy
[2]: https://github.com/libcala/wavy/actions?query=workflow%3Atests
[3]: https://github.com/libcala/wavy/blob/main/CHANGELOG.md
[4]: https://github.com/libcala/wavy/
[2]: https://github.com/ardaku/wavy/actions?query=workflow%3Atests
[3]: https://github.com/ardaku/wavy/blob/stable/CHANGELOG.md
[4]: https://github.com/ardaku/wavy/
[5]: https://docs.rs/wavy#getting-started
[6]: https://aldaronlau.com/
[7]: https://github.com/libcala/wavy/blob/main/LICENSE_APACHE_2_0.txt
[7]: https://github.com/ardaku/wavy/blob/stable/LICENSE_APACHE_2_0.txt
[8]: https://www.apache.org/licenses/LICENSE-2.0
[9]: https://github.com/libcala/wavy/blob/main/LICENSE_MIT.txt
[9]: https://github.com/ardaku/wavy/blob/stable/LICENSE_MIT.txt
[10]: https://mit-license.org/
[11]: https://github.com/libcala/wavy/blob/main/LICENSE_BOOST_1_0.txt
[11]: https://github.com/ardaku/wavy/blob/stable/LICENSE_BOOST_1_0.txt
[12]: https://www.boost.org/LICENSE_1_0.txt
[13]: mailto:[email protected]
3 changes: 1 addition & 2 deletions src/ffi/dummy/ffi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ mod device_list;
mod microphone;
mod speakers;

use device_list::SoundDevice;

pub(crate) use device_list::device_list;
use device_list::SoundDevice;
pub(super) use microphone::{Microphone, MicrophoneStream};
pub(super) use speakers::{Speakers, SpeakersSink};
3 changes: 1 addition & 2 deletions src/ffi/linux/ffi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@ mod microphone;
mod speakers;

// Implementation Expectations:
pub(crate) use asound::device_list::device_list;
use asound::{
device_list::{open, pcm_hw_params, AudioDevice, SoundDevice, DEFAULT},
PollFd, SndPcmAccess, SndPcmFormat, SndPcmMode, SndPcmState, SndPcmStream,
};

pub(crate) use asound::device_list::device_list;
pub(crate) use microphone::{Microphone, MicrophoneStream};
pub(crate) use speakers::{Speakers, SpeakersSink};
4 changes: 2 additions & 2 deletions src/ffi/linux/microphone.rs
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ impl Future for Microphone {
-77 => {
eprintln!(
"Incorrect state (-EBADFD): Report Bug to \
https://github.com/libcala/wavy/issues/new"
https://github.com/ardaku/wavy/issues/new"
);
unreachable!()
}
Expand All @@ -236,7 +236,7 @@ impl Future for Microphone {
st => {
eprintln!(
"Incorrect state = {:?} (XRUN): Report Bug \
to https://github.com/libcala/wavy/issues/new",
to https://github.com/ardaku/wavy/issues/new",
st
);
unreachable!()
Expand Down
9 changes: 6 additions & 3 deletions src/ffi/linux/pcm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,13 @@ use std::{
os::raw::{c_char, c_int, c_uint, c_void},
};

use super::super::{
PollFd, SndPcmAccess, SndPcmFormat, SndPcmMode, SndPcmState, SndPcmStream,
use super::{
super::{
PollFd, SndPcmAccess, SndPcmFormat, SndPcmMode, SndPcmState,
SndPcmStream,
},
ALSA,
};
use super::ALSA;

pub(crate) unsafe fn hw_params_set_period_size_near(
pcm: *mut c_void,
Expand Down
4 changes: 2 additions & 2 deletions src/ffi/linux/speakers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ impl Future for Speakers {
st => {
eprintln!(
"Incorrect state = {:?} (XRUN): Report Bug to \
https://github.com/libcala/wavy/issues/new",
https://github.com/ardaku/wavy/issues/new",
st
);
unreachable!()
Expand All @@ -266,7 +266,7 @@ impl Future for Speakers {
-77 => {
eprintln!(
"Incorrect state (-EBADFD): Report Bug to \
https://github.com/libcala/wavy/issues/new"
https://github.com/ardaku/wavy/issues/new"
);
unreachable!()
}
Expand Down
3 changes: 1 addition & 2 deletions src/ffi/macos/ffi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ mod device_list;
mod microphone;
mod speakers;

use device_list::SoundDevice;

pub(crate) use device_list::device_list;
use device_list::SoundDevice;
pub(super) use microphone::{Microphone, MicrophoneStream};
pub(super) use speakers::{Speakers, SpeakersSink};
2 changes: 1 addition & 1 deletion src/ffi/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@

compile_error!(
"Target os not supported, please open an issue at \
https://github.com/libcala/wavy/issues"
https://github.com/ardaku/wavy/issues"
);
3 changes: 1 addition & 2 deletions src/ffi/wasm/ffi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,7 @@ mod device_list;
mod microphone;
mod speakers;

use device_list::SoundDevice;

pub(crate) use device_list::device_list;
use device_list::SoundDevice;
pub(super) use microphone::{Microphone, MicrophoneStream};
pub(super) use speakers::{Speakers, SpeakersSink};
4 changes: 2 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@
//! ```

#![doc(
html_logo_url = "https://libcala.github.io/logo.svg",
html_favicon_url = "https://libcala.github.io/icon.svg",
html_logo_url = "https://ardaku.github.io/mm/logo.svg",
html_favicon_url = "https://ardaku.github.io/mm/icon.svg",
html_root_url = "https://docs.rs/wavy"
)]
#![deny(unsafe_code)]
Expand Down

0 comments on commit 44879aa

Please sign in to comment.