X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitch-interval.cc;h=a7390aa282cb0825f2bc744520db6c7627e5b6c5;hb=fac580f452bba58330da41b14cbe2026d8114d8f;hp=84d4911498525bcabf2decdb443af58a6e5c14a7;hpb=164cf2ac44dd14a10fc021756e67855e8820da35;p=lilypond.git diff --git a/lily/pitch-interval.cc b/lily/pitch-interval.cc index 84d4911498..a7390aa282 100644 --- a/lily/pitch-interval.cc +++ b/lily/pitch-interval.cc @@ -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; }