X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fdrul-array.hh;h=fbb45dfcec0395b0b114df1b707f487764fb3ae3;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=0e4dc34e210f09d79df1ee208c7b9bd10d2498df;hpb=2745cbd907f8216a4cc1fc5f488ae19efdfdbd10;p=lilypond.git

diff --git a/flower/include/drul-array.hh b/flower/include/drul-array.hh
index 0e4dc34e21..fbb45dfcec 100644
--- a/flower/include/drul-array.hh
+++ b/flower/include/drul-array.hh
@@ -1,53 +1,80 @@
 /*
-  drul-array.hh -- declare Drul_array
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
+  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 <http://www.gnu.org/licenses/>.
+*/
 
 #ifndef DRUL_ARRAY_HH
 #define DRUL_ARRAY_HH
 
 #include "direction.hh"
-
-#include <assert.h>
+#include "real.hh"
 
 /**
-  Left/right or Up/down arrays. Drul is nicer sounding than udlr
- */
+   Left/right or Up/down arrays. Drul is nicer sounding than udlr
+*/
 template<class T>
 struct Drul_array
 {
   T array_[2];
-  T &elem (Direction d)
-    {
-      assert (d==1 || d== -1);
-      return array_[ (d+1)/2];
-
-    }
-  T &operator[] (Direction d)
+  T &at (Direction d)
   {
-    return elem (d);
+    assert (d == 1 || d == -1);
+    return array_[ (d + 1) / 2];
   }
-  T elem (Direction d) const
-    {
-    assert (d==1 || d== -1);
-    return array_[ (d+1)/2];
-    }
-  
-  T operator[] (Direction d) const
+  T const &at (Direction d) const
   {
-    return elem (d);
+    assert (d == 1 || d == -1);
+    return array_[ (d + 1) / 2];
+  }
+  T &operator [] (Direction d)
+  {
+    return at (d);
+  }
+  T const &operator [] (Direction d) const
+  {
+    return at (d);
   }
   Drul_array ()
-    {}
-  Drul_array (T t1, T t2)
-    {
-      array_[0] = t1;
-      array_[1] = t2;
-    }
+  {
+  }
+  Drul_array (T const &t1, T const &t2)
+  {
+    set (t1, t2);
+  }
+  void set (T const &t1, T const &t2)
+  {
+    array_[0] = t1;
+    array_[1] = t2;
+  }
 };
 
-#endif // DRUL_ARRAY_HH
+template<class T>
+void
+scale_drul (Drul_array<T> *dr, T x)
+{
+  dr->at (LEFT) *= x;
+  dr->at (RIGHT) *= x;
+}
+
+inline Real
+linear_combination (Drul_array<Real> const &d, Real x)
+{
+  return ((1.0 - x) * Real (d.at (LEFT))
+          + (x + 1.0) * Real (d.at (RIGHT))) * 0.5;
+}
+
+#endif /* DRUL_ARRAY_HH */