release: 0.0.44

[lilypond.git] / lily / include / musical-request.hh

diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh
index 1ad791de40d794586ca1dbb17debdb6ca9cecac0..d9a13deda938217da2cc4b232f24526f41ccc463 100644 (file)
--- a/lily/include/musical-request.hh
+++ b/lily/include/musical-request.hh
@@ -11,6 +11,7 @@
 #define MUSICALREQUESTS_HH
 
 #include "request.hh"
+#include "duration.hh"
 
 
 /**
@@ -38,14 +39,13 @@ struct Skip_req : Musical_req {
   This request is used only a base class.
  */
 struct Rhythmic_req : virtual Musical_req {
-    int balltype;
-    int dots;
-    Moment plet_factor;
+    Duration duration_;
+    
     /* *************** */
+    void set_duration(Duration);
     static int compare(const Rhythmic_req &, const Rhythmic_req &);
     virtual Moment duration() const;
     Rhythmic_req();
-    Rhythmic_req(int,int);
     REQUESTMETHODS(Rhythmic_req, rhythmic);
 };
 
@@ -96,9 +96,11 @@ struct Melodic_req :virtual Musical_req
     /// 0 natural, 1 sharp, etc
     int accidental_i_;
 
-
     /// return height from central c (in halflines)
-    int height()const; 
+    int height()const;
+
+    /// transpose. #delta# is relative to central c.
+    void transpose(Melodic_req const &delta);
     /// return pitch from central c (in halfnotes)
     int pitch()const; 
     Melodic_req();
@@ -131,7 +133,7 @@ public:
 struct Stem_req : Rhythmic_req {
     /// preferred direction for the stem
     int dir_i_;
-    Stem_req(int s, int dots);
+    Stem_req();
     REQUESTMETHODS(Stem_req,stem);
 };