Skip to content

Use portable-atomic on platforms without u64 atomics #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
linkmauve wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use portable-atomic on platforms without u64 atomics #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions crates/kira/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ features = ["wasm-bindgen"]
[target.'cfg(target_arch = "wasm32")'.dependencies]
send_wrapper = "0.6.0"

[target.'cfg(not(target_has_atomic = "64"))'.dependencies]
portable-atomic = "1"

[features]
default = ["cpal", "mp3", "ogg", "flac", "wav"]
mp3 = ["symphonia", "symphonia/mp3"]
Expand Down
7 changes: 6 additions & 1 deletion crates/kira/src/backend/cpal/desktop/stream_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,16 @@ mod send_on_drop;
use std::{
sync::{
Arc, Mutex,
atomic::{AtomicBool, AtomicU64, Ordering},
atomic::{AtomicBool, Ordering},
},
time::Duration,
};

#[cfg(target_has_atomic = "64")]
use std::sync::atomic::AtomicU64;
#[cfg(not(target_has_atomic = "64"))]
use portable_atomic::AtomicU64;

use super::renderer_with_cpu_usage::RendererWithCpuUsage;
use cpal::{
BufferSize, Device, Stream, StreamConfig, StreamError,
Expand Down
7 changes: 6 additions & 1 deletion crates/kira/src/clock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,14 @@ pub use time::*;

use std::sync::{
Arc,
atomic::{AtomicBool, AtomicU64, Ordering},
atomic::{AtomicBool, Ordering},
};

#[cfg(target_has_atomic = "64")]
use std::sync::atomic::AtomicU64;
#[cfg(not(target_has_atomic = "64"))]
use portable_atomic::AtomicU64;

use crate::{
Parameter, Value,
command::{ValueChangeCommand, read_commands_into_parameters},
Expand Down
7 changes: 6 additions & 1 deletion crates/kira/src/sound/static_sound/sound.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,14 @@ mod test;

use std::sync::{
Arc,
atomic::{AtomicU8, AtomicU64, Ordering},
atomic::{AtomicU8, Ordering},
};

#[cfg(target_has_atomic = "64")]
use std::sync::atomic::AtomicU64;
#[cfg(not(target_has_atomic = "64"))]
use portable_atomic::AtomicU64;

use crate::{
Decibels, Panning, Parameter, PlaybackRate, StartTime, Tween,
command::read_commands_into_parameters,
Expand Down
7 changes: 6 additions & 1 deletion crates/kira/src/sound/streaming/sound.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,14 @@ mod test;

use std::sync::{
Arc,
atomic::{AtomicBool, AtomicU8, AtomicU64, Ordering},
atomic::{AtomicBool, AtomicU8, Ordering},
};

#[cfg(target_has_atomic = "64")]
use std::sync::atomic::AtomicU64;
#[cfg(not(target_has_atomic = "64"))]
use portable_atomic::AtomicU64;

use crate::{
Decibels, Panning, Parameter, PlaybackRate, StartTime, Tween,
command::read_commands_into_parameters,
Expand Down