release: 0.0.50

[lilypond.git] / lily / beam.cc

diff --git a/lily/beam.cc b/lily/beam.cc
index a20e859e23a03cefda2226205432aa672d5e7553..389226fa7158a8e09e97923ad3e4f9918c16b1d5 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -30,7 +30,7 @@ struct Stem_info {
 Stem_info::Stem_info(Stem const *s)
 {
     x = s->hindex();
-    int dir = s->dir;
+    int dir = s->dir_i_;
     idealy  = max(dir*s->top, dir*s->bot);
     miny = max(dir*s->minnote, dir*s-> maxnote);
     assert(miny <= idealy);
@@ -74,7 +74,7 @@ Beam::set_default_dir()
     }
     dir_i_ =  (dirs[0] > dirs[1]) ? -1 : 1;
     for (iter_top(stems,i); i.ok(); i++) {
-       i->dir = dir_i_;
+       i->dir_i_ = dir_i_;
     }
 }
 
@@ -190,7 +190,7 @@ Beam::do_pre_processing()
 
 
 Interval
-Beam::width() const
+Beam::do_width() const
 {
     Beam * me = (Beam*) this;  // ugh
     return Interval( (*me->stems.top()) ->hindex(),