X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-item.cc;h=a8a78199c73096c15375110f5c50020b28912d13;hb=8e2eaf4959bec63a1128a444591a540f4f1e2937;hp=60a6badc8dd6292065a6b965ebde17388eae73de;hpb=cec6dfa6bf0fb931eb7f42b1ee44ca2ec19a9f34;p=lilypond.git diff --git a/lily/audio-item.cc b/lily/audio-item.cc index 60a6badc8d..a8a78199c7 100644 --- a/lily/audio-item.cc +++ b/lily/audio-item.cc @@ -1,116 +1,212 @@ /* - audio-item.cc -- implement Audio items. + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2015 Jan Nieuwenhuizen - (c) 1997 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ -#include "debug.hh" + #include "audio-item.hh" + #include "midi-item.hh" -#include "request.hh" #include "audio-column.hh" +#include "international.hh" -Audio_instrument::Audio_instrument (String instrument_str) - : Audio_item (0) +Audio_instrument::Audio_instrument (string instrument_string) { - str_ = instrument_str; + str_ = instrument_string; } -Midi_item* -Audio_instrument::midi_item_p() +void +Audio_item::render () { - return str_.length_i() ? new Midi_instrument(0, str_) : 0; } -IMPLEMENT_IS_TYPE_B1(Audio_instrument, Audio_item); -Audio_item::Audio_item (Request* req_l) +Audio_column * +Audio_item::get_column () const { - audio_column_l_ = 0; - req_l_ = req_l; + return audio_column_; } -Audio_key::Audio_key (Request* req_l) - : Audio_item (req_l) +Audio_item::Audio_item () + : audio_column_ (0), + channel_ (0) { } -Midi_item* -Audio_key::midi_item_p() +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) { - return new Midi_key (this); } -IMPLEMENT_IS_TYPE_B1 (Audio_key, Audio_item); -Audio_note::Audio_note (Request* req_l) - : Audio_item (req_l) +void +Audio_note::tie_to (Audio_note *t, Moment skip) { + tied_ = t; + 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; } -Midi_item* -Audio_note::midi_item_p() +Audio_note * +Audio_note::tie_head () { - return new Midi_note (this); + Audio_note *first = this; + while (first->tied_) + first = first->tied_; + return first; } -IMPLEMENT_IS_TYPE_B1(Audio_note, Audio_item); - -Audio_tempo::Audio_tempo (int per_minute_4_i) - : Audio_item (0) +string +Audio_note::to_string () const { - per_minute_4_i_ = per_minute_4_i; + string s = "#to_string(); + } + if (tie_event_) + { + s += " tie_event"; + } + s += ">"; + return s; } -Midi_item* -Audio_tempo::midi_item_p() +Audio_key::Audio_key (int acc, bool major) { - return new Midi_tempo (this); + accidentals_ = acc; + major_ = major; } -IMPLEMENT_IS_TYPE_B1(Audio_tempo, Audio_item); +const Real Audio_span_dynamic::MINIMUM_VOLUME = 0.0; +const Real Audio_span_dynamic::MAXIMUM_VOLUME = 1.0; +const Real Audio_span_dynamic::DEFAULT_VOLUME = 90.0 / 127.0; -Audio_meter::Audio_meter (Request* req_l) - : Audio_item (req_l) +Audio_span_dynamic::Audio_span_dynamic (Moment mom, Real volume) + : start_moment_ (mom), + duration_ (0) { + set_volume (volume, volume); } -Midi_item* -Audio_meter::midi_item_p() +Moment +remap_grace_duration (Moment m) { - return new Midi_meter (this); + return Moment (m.main_part_ + Rational (9, 40) * m.grace_part_, + Rational (0)); } -IMPLEMENT_IS_TYPE_B1(Audio_meter, Audio_item); -Audio_text::Audio_text (Audio_text::Type type, String text_str) - : Audio_item (0) +Real +moment_to_real (Moment m) { - text_str_ = text_str; - type_ = type; + return remap_grace_duration (m).main_part_.to_double (); } -Midi_item* -Audio_text::midi_item_p() +int +moment_to_ticks (Moment m) { - return text_str_.length_i() ? new Midi_text(this) : 0; + return int (moment_to_real (m) * 384 * 4); } -IMPLEMENT_IS_TYPE_B1(Audio_text, Audio_item); +void Audio_span_dynamic::set_end_moment (Moment mom) +{ + if (mom < start_moment_) + { + programming_error (_f ("end moment (%s) < start moment (%s)", + mom.to_string ().c_str (), + start_moment_.to_string ().c_str ())); + mom = start_moment_; + } -IMPLEMENT_IS_TYPE_B1(Audio_item, Audio_element); + duration_ = moment_to_real (mom - start_moment_); +} void -Audio_item::do_print () const +Audio_span_dynamic::set_volume (Real start, Real target) +{ + if (!(start >= 0)) + { + programming_error (_f ("invalid start volume: %f", start)); + start = DEFAULT_VOLUME; + } + + if (!(target >= 0)) + { + programming_error (_f ("invalid target volume: %f", target)); + target = start; + } + + start_volume_ = start; + gain_ = target - start; +} + +Real Audio_span_dynamic::get_volume (Moment mom) const { -#ifndef NPRINT - if (audio_column_l_) + const Real when = moment_to_real (mom - start_moment_); + + if (when <= 0) { - DOUT << "at: "<< audio_column_l_->at_mom (); + if (when < 0) + programming_error (_f ("asked to compute volume at %f for dynamic span of duration %f starting at %s", + when, duration_, + start_moment_.to_string ().c_str ())); + return start_volume_; } - if (req_l_) + + if (when >= duration_) { - DOUT << "from: "; - req_l_->print (); + programming_error (_f ("asked to compute volume at +%f for dynamic span of duration %f starting at %s", + when, duration_, + start_moment_.to_string ().c_str ())); + return start_volume_ + gain_; } -#endif + + return start_volume_ + gain_ * (when / duration_); +} + +Audio_tempo::Audio_tempo (int per_minute_4) +{ + per_minute_4_ = per_minute_4; +} + +Audio_time_signature::Audio_time_signature (int beats, int one_beat) +{ + beats_ = beats; + one_beat_ = one_beat; +} + +Audio_text::Audio_text (Audio_text::Type type, const string &text_string) +{ + text_string_ = text_string; + type_ = type; } +Audio_control_change::Audio_control_change (int control, int value) + : control_ (control), + value_ (value) +{ +}