X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitch-interval.cc;h=8c70cf4a09f1dee81582e7608b05ff374d4ace73;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=84d4911498525bcabf2decdb443af58a6e5c14a7;hpb=7c866230d0fb5c9b997d1c792378a85818206125;p=lilypond.git diff --git a/lily/pitch-interval.cc b/lily/pitch-interval.cc index 84d4911498..8c70cf4a09 100644 --- a/lily/pitch-interval.cc +++ b/lily/pitch-interval.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2004--2007 Han-Wen Nienhuys + (c) 2004--2008 Han-Wen Nienhuys */ #include "pitch-interval.hh" @@ -28,21 +28,21 @@ Pitch_interval::is_empty () const return at (LEFT) > at (RIGHT); } -Direction +Drul_array Pitch_interval::add_point (Pitch p) { + Drul_array expansions(false,false); if (at (LEFT).tone_pitch () > p.tone_pitch ()) { at (LEFT) = p; - return LEFT; + expansions [LEFT] = true; } - else if (at (RIGHT).tone_pitch () < p.tone_pitch ()) + if (at (RIGHT).tone_pitch () < p.tone_pitch ()) { at (RIGHT) = p; - return RIGHT; + expansions [RIGHT] = true; } - else - return CENTER; + return expansions; } @@ -64,19 +64,19 @@ Pitch_lexicographic_interval::is_empty () const return at (LEFT) > at (RIGHT); } -Direction +Drul_array Pitch_lexicographic_interval::add_point (Pitch p) { + Drul_array expansions(false,false); if (at (LEFT) > p) { at (LEFT) = p; - return LEFT; + expansions [LEFT] = true; } - else if (at (RIGHT) < p) + if (at (RIGHT) < p) { at (RIGHT) = p; - return RIGHT; + expansions [RIGHT] = true; } - else - return CENTER; + return expansions; }