Skip to content
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

Jump to bottom

Add methods to define region ends #104

Merged
merged 2 commits into from
Sep 6, 2023
Merged

Add methods to define region ends #104

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae5e1ce
Add methods to define region ends
Tracreed Aug 9, 2023
03f1c14
cargo fmt
Tracreed Aug 9, 2023
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
52 changes: 36 additions & 16 deletions src/audio.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use bevy::asset::{Handle, HandleId};
use bevy::ecs::system::Resource;
use bevy::prelude::{default, IntoSystemConfigs, PostUpdate};
use kira::sound::static_sound::{StaticSoundData, StaticSoundHandle};
use kira::sound::{EndPosition, PlaybackPosition, Region};
use kira::sound::EndPosition;
use kira::tween::Value;
use kira::Volume;
use std::marker::PhantomData;
Expand All @@ -29,10 +29,12 @@ pub(crate) enum AudioCommand {

#[derive(Clone, Default)]
pub(crate) struct PartialSoundSettings {
pub(crate) loop_start: Option<Option<f64>>,
pub(crate) loop_start: Option<f64>,
pub(crate) loop_end: Option<f64>,
pub(crate) volume: Option<Volume>,
pub(crate) playback_rate: Option<f64>,
pub(crate) start_position: Option<f64>,
pub(crate) end_position: Option<f64>,
pub(crate) panning: Option<f64>,
pub(crate) reverse: Option<bool>,
pub(crate) fade_in: Option<AudioTween>,
Expand Down Expand Up @@ -104,14 +106,18 @@ impl From<&AudioTween> for kira::tween::Tween {
impl PartialSoundSettings {
pub(crate) fn apply(&self, sound: &mut StaticSoundData) {
if let Some(loop_start) = self.loop_start {
if let Some(start) = loop_start {
sound.settings.loop_region = Some(Region {
start: PlaybackPosition::Seconds(start),
end: EndPosition::EndOfAudio,
})
} else {
sound.settings.loop_region = None;
}
sound
.settings
.loop_region
.get_or_insert_with(Default::default)
.start = loop_start.into();
}
if let Some(loop_end) = self.loop_end {
sound
.settings
.loop_region
.get_or_insert_with(Default::default)
.end = EndPosition::Custom(loop_end.into());
}
if let Some(volume) = self.volume {
sound.settings.volume = Value::Fixed(volume);
Expand All @@ -120,10 +126,10 @@ impl PartialSoundSettings {
sound.settings.playback_rate = playback_rate.into();
}
if let Some(start) = self.start_position {
sound.settings.playback_region = Region {
start: PlaybackPosition::Seconds(start),
end: EndPosition::EndOfAudio,
};
sound.settings.playback_region.start = start.into();
}
if let Some(end) = self.end_position {
sound.settings.playback_region.end = EndPosition::Custom(end.into());
}
if let Some(panning) = self.panning {
sound.settings.panning = Value::Fixed(panning);
Expand Down Expand Up @@ -184,14 +190,21 @@ impl<'a> PlayAudioCommand<'a> {

/// Loop the playing sound.
pub fn looped(&mut self) -> &mut Self {
self.settings.loop_start = Some(Some(0.0));
self.settings.loop_start = Some(0.0);

self
}

/// Loop the playing sound, starting from the given position.
pub fn loop_from(&mut self, loop_start_position: f64) -> &mut Self {
self.settings.loop_start = Some(Some(loop_start_position));
self.settings.loop_start = Some(loop_start_position);

self
}

/// Loop the playing sound, ending at the given position.
pub fn loop_to(&mut self, loop_end_position: f64) -> &mut Self {
self.settings.loop_end = Some(loop_end_position);

self
}
Expand All @@ -217,6 +230,13 @@ impl<'a> PlayAudioCommand<'a> {
self
}

/// End the sound at the given position in seconds.
pub fn end_at(&mut self, end_position: f64) -> &mut Self {
self.settings.end_position = Some(end_position);

self
}

/// Set the panning of the sound.
///
/// The default value is 0.5.
Expand Down
Loading