From 0a307fbf05331ca0314d1144d0adfa4f9245269c Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Sun, 3 Jan 2021 11:27:49 -0800 Subject: [PATCH] Removed Cue.ident field from interface --- src/cue.rs | 13 +++++++++++-- src/wavereader.rs | 3 --- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/cue.rs b/src/cue.rs index 9d42411..0bc4ba7 100644 --- a/src/cue.rs +++ b/src/cue.rs @@ -20,6 +20,15 @@ struct RawCue { } impl RawCue { + + fn write_to(cues : Vec) -> Vec { + let mut writer = Cursor::new(vec![0u8; 0]); + + + todo!() + + } + fn read_from(data : &[u8]) -> Result,Error> { let mut rdr = Cursor::new(data); let count = rdr.read_u32::()?; @@ -198,7 +207,7 @@ impl AdtlMemberSearch for Vec { pub struct Cue { /// Unique numeric identifier for this cue - pub ident : u32, + //pub ident : u32, /// The time of this marker pub frame : u32, @@ -236,7 +245,7 @@ impl Cue { raw_cues.iter() .map(|i| { Cue { - ident : i.cue_point_id, + //ident : i.cue_point_id, frame : i.frame, length: { raw_adtl.ltxt_for_cue_point(i.cue_point_id).first() diff --git a/src/wavereader.rs b/src/wavereader.rs index 73a2bf1..f583bba 100644 --- a/src/wavereader.rs +++ b/src/wavereader.rs @@ -320,19 +320,16 @@ impl WaveReader { /// let cue_points = f.cue_points().unwrap(); /// /// assert_eq!(cue_points.len(), 3); - /// assert_eq!(cue_points[0].ident, 1); /// assert_eq!(cue_points[0].frame, 12532); /// assert_eq!(cue_points[0].length, None); /// assert_eq!(cue_points[0].label, Some(String::from("Marker 1"))); /// assert_eq!(cue_points[0].note, Some(String::from("Marker 1 Comment"))); /// - /// assert_eq!(cue_points[1].ident, 2); /// assert_eq!(cue_points[1].frame, 20997); /// assert_eq!(cue_points[1].length, None); /// assert_eq!(cue_points[1].label, Some(String::from("Marker 2"))); /// assert_eq!(cue_points[1].note, Some(String::from("Marker 2 Comment"))); /// - /// assert_eq!(cue_points[2].ident, 3); /// assert_eq!(cue_points[2].frame, 26711); /// assert_eq!(cue_points[2].length, Some(6465)); /// assert_eq!(cue_points[2].label, Some(String::from("Timed Region")));