release: 1.5.29

[lilypond.git] / lily / include / music-wrapper.hh

diff --git a/lily/include/music-wrapper.hh b/lily/include/music-wrapper.hh
index 95d7f0bd84dde133dc280f7aee93170e3aedecb0..887182b73f8f353bca168b2498e10e37a4fd4613 100644 (file)
--- a/lily/include/music-wrapper.hh
+++ b/lily/include/music-wrapper.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -11,7 +11,7 @@
 #define MUSIC_WRAPPER_HH
 
 #include "music.hh"
-#include "musical-pitch.hh"
+#include "pitch.hh"
 
 /** A Music that modifies an existing Music.  This data structure
   corresponds to a production that takes a single Music argument,
@@ -21,18 +21,17 @@
   */
 class Music_wrapper : public Music
 {
-  Music * element_p_;
 public:
-  Music_wrapper (Music*);
-  Music * element_l () const;
-  virtual void transpose (Musical_pitch);
-  virtual void do_print () const;
+  Music_wrapper (SCM);
+  Music_wrapper ();
+  Music * element () const;
+  virtual void transpose (Pitch);
+
   
-  VIRTUAL_COPY_CONS(Music);
-  Music_wrapper (Music_wrapper const&);
+  VIRTUAL_COPY_CONS (Music);
   virtual Moment length_mom () const;
-  virtual ~Music_wrapper ();
-  virtual Musical_pitch to_relative_octave (Musical_pitch);
+  virtual Moment start_mom () const;
+  virtual Pitch to_relative_octave (Pitch);
   virtual void compress (Moment);
 };