2003 -> 2004

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

diff --git a/lily/include/music-wrapper.hh b/lily/include/music-wrapper.hh
index 14c99c6726e1eb7028096a494ec76bc71a422742..aa7b53937a414bfe3d77fc9c0ee8c889f764cf71 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 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,
@@ -22,17 +22,12 @@
 class Music_wrapper : public Music
 {
 public:
-  Music * element_p_;
-  Music_wrapper (Music*);
-  virtual void transpose (Musical_pitch);
-  virtual void do_print () const;
-  
-  VIRTUAL_COPY_CONS(Music);
-  Music_wrapper (Music_wrapper const&);
-  virtual Moment duration () const;
-  virtual ~Music_wrapper ();
-  virtual Musical_pitch to_relative_octave (Musical_pitch);
+  Music_wrapper ();
+  Music * element () const;
   
+  VIRTUAL_COPY_CONS (Music);
+  virtual Moment get_length () const;
+  virtual Moment start_mom () const;
 };