Skip to content

Commit

Permalink
Merge pull request RustAudio#2 from anton-okolelov/master
Browse files Browse the repository at this point in the history
assertion bug fix
  • Loading branch information
nicklan committed Nov 16, 2015
2 parents fe350c4 + 49c9bf8 commit 3095b04
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ impl SMFBuilder {
/// Panics if `track` is >= to the number of tracks in this
/// builder, or if the track already has a copyright set.
pub fn set_copyright(&mut self, track: usize, copyright: String) {
assert!(self.tracks.len() < track);
assert!(self.tracks.len() > track);
assert!(self.tracks[track].copyright.is_none());
// let event = AbsoluteEvent {
// time: 0,
Expand All @@ -250,7 +250,7 @@ impl SMFBuilder {
/// Panics if `track` is >= to the number of tracks in this
/// builder, or if the track already has a name set.
pub fn set_name(&mut self, track: usize, name: String) {
assert!(self.tracks.len() < track);
assert!(self.tracks.len() > track);
assert!(self.tracks[track].name.is_none());
// let event = AbsoluteEvent{
// time: 0,
Expand All @@ -266,7 +266,7 @@ impl SMFBuilder {
///
/// Panics if `track` is >= to the number of tracks in this builder
pub fn add_midi_abs(&mut self, track: usize, time: u64, msg: MidiMessage) {
assert!(self.tracks.len() < track);
assert!(self.tracks.len() > track);
match self.tracks.index_mut(track).events {
EventContainer::Heap(ref mut heap) => {
heap.push(AbsoluteEvent {
Expand All @@ -286,7 +286,7 @@ impl SMFBuilder {
///
/// Panics if `track` is >= to the number of tracks in this builder
pub fn add_midi_rel(&mut self, track: usize, delta: u64, msg: MidiMessage) {
assert!(self.tracks.len() < track);
assert!(self.tracks.len() > track);
let time = self.tracks[track].abs_time_from_delta(delta);
self.add_midi_abs(track,time,msg);
}
Expand All @@ -298,7 +298,7 @@ impl SMFBuilder {
///
/// Panics if `track` is >= to the number of tracks in this builder
pub fn add_meta_abs(&mut self, track: usize, time: u64, event: MetaEvent) {
assert!(self.tracks.len() < track);
assert!(self.tracks.len() > track);
match self.tracks.index_mut(track).events {
EventContainer::Heap(ref mut heap) => {
heap.push(AbsoluteEvent {
Expand All @@ -318,7 +318,7 @@ impl SMFBuilder {
///
/// Panics if `track` is >= to the number of tracks in this builder
pub fn add_meta_rel(&mut self, track: usize, delta: u64, event: MetaEvent) {
assert!(self.tracks.len() < track);
assert!(self.tracks.len() > track);
let time = self.tracks[track].abs_time_from_delta(delta);
self.add_meta_abs(track,time,event);
}
Expand All @@ -331,7 +331,7 @@ impl SMFBuilder {
///
/// Panics if `track` is >= to the number of tracks in this builder
pub fn add_event(&mut self, track: usize, event: TrackEvent) {
assert!(self.tracks.len() < track);
assert!(self.tracks.len() > track);
let bevent = AbsoluteEvent {
time: self.tracks[track].abs_time_from_delta(event.vtime),
event: event.event,
Expand Down

0 comments on commit 3095b04

Please sign in to comment.