X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-item.cc;h=97a15d552aafaedc86053945c291d1d796d2eb7d;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=fb1976d561d75471ee4a2a20c97e9af087baa795;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git diff --git a/lily/audio-item.cc b/lily/audio-item.cc index fb1976d561..97a15d552a 100644 --- a/lily/audio-item.cc +++ b/lily/audio-item.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2010 Jan Nieuwenhuizen + Copyright (C) 1997--2015 Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -39,32 +39,62 @@ Audio_item::get_column () const } Audio_item::Audio_item () + : audio_column_ (0), + channel_ (0) { - audio_column_ = 0; } -Audio_note::Audio_note (Pitch p, Moment m, bool tie_event, Pitch transposing) +Audio_note::Audio_note (Pitch p, Moment m, bool tie_event, Pitch transposing, + int velocity) + : pitch_ (p), + length_mom_ (m), + transposing_ (transposing), + dynamic_ (0), + extra_velocity_ (velocity), + tied_ (0), + tie_event_ (tie_event) { - pitch_ = p; - length_mom_ = m; - tied_ = 0; - transposing_ = transposing; - tie_event_ = tie_event; } void Audio_note::tie_to (Audio_note *t, Moment skip) { tied_ = t; - Audio_note *first = t; - while (first->tied_) - first = first->tied_; + Audio_note *first = tie_head(); // Add the skip to the tied note and the length of the appended note // to the full duration of the tie... first->length_mom_ += skip + length_mom_; length_mom_ = 0; } +Audio_note * +Audio_note::tie_head () +{ + Audio_note *first = this; + while (first->tied_) + first = first->tied_; + return first; +} + +string +Audio_note::to_string () const +{ + string s = "#to_string(); + } + if (tie_event_) + { + s += " tie_event"; + } + s += ">"; + return s; +} + Audio_key::Audio_key (int acc, bool major) { accidentals_ = acc; @@ -72,13 +102,16 @@ Audio_key::Audio_key (int acc, bool major) } Audio_dynamic::Audio_dynamic () + : volume_ (-1), + silent_ (false) { - volume_ = -1; } -Audio_span_dynamic::Audio_span_dynamic () +Audio_span_dynamic::Audio_span_dynamic (Real min_volume, Real max_volume) { grow_dir_ = CENTER; + min_volume_ = min_volume; + max_volume_ = max_volume; } void @@ -91,8 +124,8 @@ Audio_span_dynamic::add_absolute (Audio_dynamic *d) Moment remap_grace_duration (Moment m) { - return Moment (m.main_part_ + Rational (9,40) * m.grace_part_, - Rational (0)); + return Moment (m.main_part_ + Rational (9, 40) * m.grace_part_, + Rational (0)); } Real @@ -111,50 +144,51 @@ void Audio_span_dynamic::render () { if (dynamics_.size () <= 1) - return ; + return; assert (dynamics_[0]->volume_ >= 0); - while (dynamics_.back ()->volume_ > 0 - && dynamics_.size () > 1 - && sign (dynamics_.back ()->volume_ - dynamics_[0]->volume_) != grow_dir_) + while (dynamics_.back ()->volume_ > 0 + && dynamics_.size () > 1 + && sign (dynamics_.back ()->volume_ - dynamics_[0]->volume_) != grow_dir_) { dynamics_.erase (dynamics_.end () - 1); } if (dynamics_.size () <= 1) { - programming_error ("(de)crescendo on items with specified volume."); - return ; + programming_error ("Impossible or ambiguous (de)crescendo in MIDI."); + return; } - - Real delta_v = grow_dir_ * 0.1; - + Real start_v = dynamics_[0]->volume_; if (dynamics_.back ()->volume_ < 0) - dynamics_.back ()->volume_ = max (min (start_v + grow_dir_ * 0.25, 1.0), 0.1); + { + // The dynamic spanner does not end with an explicit dynamic script + // event. Adjust the end volume by at most 1/4 of the available + // volume range in this case. + dynamics_.back ()->volume_ = max (min (start_v + grow_dir_ * (max_volume_ - min_volume_) * 0.25, max_volume_), min_volume_); + } - delta_v = dynamics_.back ()->volume_ - dynamics_[0]->volume_; + Real delta_v = dynamics_.back ()->volume_ - dynamics_[0]->volume_; Moment start = dynamics_[0]->get_column ()->when (); Real total_t = moment_to_real (dynamics_.back ()->get_column ()->when () - start); - - for (vsize i = 1; i < dynamics_.size (); i ++) + + for (vsize i = 1; i < dynamics_.size (); i++) { Moment dt_moment = dynamics_[i]->get_column ()->when () - - start; + - start; - Real dt = moment_to_real (dt_moment); - - Real v = start_v + delta_v * (dt / total_t); + Real dt = moment_to_real (dt_moment); - dynamics_[i]->volume_ = v; + Real v = start_v + delta_v * (dt / total_t); + + dynamics_[i]->volume_ = v; } } - - Audio_tempo::Audio_tempo (int per_minute_4) { per_minute_4_ = per_minute_4; @@ -166,9 +200,26 @@ Audio_time_signature::Audio_time_signature (int beats, int one_beat) one_beat_ = one_beat; } -Audio_text::Audio_text (Audio_text::Type type, string text_string) +Audio_text::Audio_text (Audio_text::Type type, const string &text_string) { text_string_ = text_string; type_ = type; } +Audio_control_function_value_change +::Audio_control_function_value_change (Control control, Real value) + : control_ (control), value_ (value) +{ +} + +const Audio_control_function_value_change::Context_property +Audio_control_function_value_change::context_properties_[] = { + // property name, enum constant, lower bound for range, upper bound for range + { "midiBalance", BALANCE, -1.0, 1.0 }, + { "midiPanPosition", PAN_POSITION, -1.0, 1.0 }, + { "midiExpression", EXPRESSION, 0.0, 1.0 }, + { "midiReverbLevel", REVERB_LEVEL, 0.0, 1.0 }, + { "midiChorusLevel", CHORUS_LEVEL, 0.0, 1.0 }, + // extra element to signify the end of the mapping, must be kept last + { 0, NUM_CONTROLS, 0.0, 0.0 } +};