summaryrefslogtreecommitdiff
path: root/rust/crates/timeline/src
diff options
context:
space:
mode:
Diffstat (limited to 'rust/crates/timeline/src')
-rw-r--r--rust/crates/timeline/src/placement/apply.rs14
-rw-r--r--rust/crates/timeline/src/placement/mod.rs8
2 files changed, 4 insertions, 18 deletions
diff --git a/rust/crates/timeline/src/placement/apply.rs b/rust/crates/timeline/src/placement/apply.rs
index 4e044a68..56c3fd0a 100644
--- a/rust/crates/timeline/src/placement/apply.rs
+++ b/rust/crates/timeline/src/placement/apply.rs
@@ -46,8 +46,8 @@ pub fn apply_placement(params: &ApplyPlacementParams) -> Option<PlacementApplied
let insert_index = params
.new_track_insert_index_override
.unwrap_or(*insert_index);
- let new_track = build_empty_track(new_track_id.clone(), *track_type, None)
- .with_elements(params.elements.clone());
+ let mut new_track = build_empty_track(new_track_id.clone(), *track_type, None);
+ *new_track.elements_mut() = params.elements.clone();
let updated_tracks = if *track_type == TrackType::Audio {
SceneTracks {
@@ -89,13 +89,3 @@ fn insert_into_audio_tracks(tracks: &SceneTracks, insert_index: usize, track: Tr
next
}
-trait WithElements {
- fn with_elements(self, elements: Vec<Element>) -> Self;
-}
-
-impl WithElements for Track {
- fn with_elements(mut self, elements: Vec<Element>) -> Self {
- *self.elements_mut() = elements;
- self
- }
-}
diff --git a/rust/crates/timeline/src/placement/mod.rs b/rust/crates/timeline/src/placement/mod.rs
index 8ad5710e..4eb2660e 100644
--- a/rust/crates/timeline/src/placement/mod.rs
+++ b/rust/crates/timeline/src/placement/mod.rs
@@ -1,4 +1,4 @@
-use scene::{Element, SceneTracks, Track};
+use scene::{SceneTracks, Track};
use time::MediaTime;
use crate::types::{ElementType, TrackType};
@@ -21,7 +21,7 @@ pub use insert_index::{
};
pub use main_track::{MAIN_TRACK_NAME, enforce_main_track_start, get_earliest_main_track_element};
pub use overlap::can_place_time_spans_on_track;
-pub use resolve::resolve_track_placement;
+pub use resolve::{ResolveTrackPlacementParams, resolve_track_placement};
pub use track_factory::build_empty_track;
#[derive(Clone, Debug, PartialEq)]
@@ -98,7 +98,3 @@ pub fn ordered_tracks(tracks: &SceneTracks) -> Vec<&Track> {
.chain(tracks.audio.iter())
.collect()
}
-
-pub fn track_elements(track: &Track) -> &[Element] {
- track.elements()
-}