X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-item.cc;h=8459aa8c54547dd9e54d7497f744121156f9acaa;hb=e5380f29f23e204a603f8398368d2a7dc0260aa0;hp=36e11807b097e0d64bce4377eb443f81f28600c0;hpb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;p=lilypond.git diff --git a/lily/audio-item.cc b/lily/audio-item.cc index 36e11807b0..8459aa8c54 100644 --- a/lily/audio-item.cc +++ b/lily/audio-item.cc @@ -1,117 +1,175 @@ /* - 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--2011 Jan Nieuwenhuizen - (c) 1997--1999 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" -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; } - -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) { - return new Midi_key (this); + pitch_ = p; + length_mom_ = m; + tied_ = 0; + transposing_ = transposing; + tie_event_ = tie_event; } - -Audio_note::Audio_note (Request* req_l, int transposing_i) - : Audio_item (req_l) +void +Audio_note::tie_to (Audio_note *t, Moment skip) { - transposing_i_ = transposing_i; + tied_ = t; + Audio_note *first = t; + while (first->tied_) + first = first->tied_; + // 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_key::Audio_key (int acc, bool major) { - return new Midi_note (this); + accidentals_ = acc; + major_ = major; } - - -Audio_tempo::Audio_tempo (int per_minute_4_i) - : Audio_item (0) +Audio_dynamic::Audio_dynamic () { - per_minute_4_i_ = per_minute_4_i; + volume_ = -1; } -Midi_item* -Audio_tempo::midi_item_p() +Audio_span_dynamic::Audio_span_dynamic () { - return new Midi_tempo (this); + grow_dir_ = CENTER; } - - -Audio_time_signature::Audio_time_signature (Request* req_l) - : Audio_item (req_l) +void +Audio_span_dynamic::add_absolute (Audio_dynamic *d) { + assert (d); + dynamics_.push_back (d); } -Midi_item* -Audio_time_signature::midi_item_p() +Moment +remap_grace_duration (Moment m) { - return new Midi_time_signature (this); + return Moment (m.main_part_ + Rational (9,40) * m.grace_part_, + Rational (0)); } - - -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); } +void +Audio_span_dynamic::render () +{ + if (dynamics_.size () <= 1) + return ; + assert (dynamics_[0]->volume_ >= 0); + while (dynamics_.back ()->volume_ > 0 + && dynamics_.size () > 1 + && sign (dynamics_.back ()->volume_ - dynamics_[0]->volume_) != grow_dir_) + { + dynamics_.erase (dynamics_.end () - 1); + } -void -Audio_item::do_print () const -{ -#ifndef NPRINT - if (audio_column_l_) + if (dynamics_.size () <= 1) { - DOUT << "at: "<< audio_column_l_->at_mom (); + programming_error ("Impossible or ambiguous (de)crescendo in MIDI."); + return ; } - if (req_l_) + + 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); + + 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 ++) { - DOUT << "from: "; - req_l_->print (); + Moment dt_moment = dynamics_[i]->get_column ()->when () + - start; + + Real dt = moment_to_real (dt_moment); + + Real v = start_v + delta_v * (dt / total_t); + + dynamics_[i]->volume_ = v; } -#endif +} + + + +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, string text_string) +{ + text_string_ = text_string; + type_ = type; }