X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic-wrapper.hh;h=94b2a3165ec91167899c2cc49849d432934dfafa;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=887182b73f8f353bca168b2498e10e37a4fd4613;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git

diff --git a/lily/include/music-wrapper.hh b/lily/include/music-wrapper.hh
index 887182b73f..94b2a3165e 100644
--- a/lily/include/music-wrapper.hh
+++ b/lily/include/music-wrapper.hh
@@ -1,42 +1,22 @@
-/*   
+/*
   music-wrapper.hh -- declare Music_wrapper
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef MUSIC_WRAPPER_HH
 #define MUSIC_WRAPPER_HH
 
-#include "music.hh"
-#include "pitch.hh"
+#include "lily-guile.hh"
 
-/** A Music that modifies an existing Music.  This data structure
-  corresponds to a production that takes a single Music argument,
-  
-  Music: STUFF Music 
-
-  */
-class Music_wrapper : public Music
+struct Music_wrapper
 {
 public:
-  Music_wrapper (SCM);
-  Music_wrapper ();
-  Music * element () const;
-  virtual void transpose (Pitch);
-
-  
-  VIRTUAL_COPY_CONS (Music);
-  virtual Moment length_mom () const;
-  virtual Moment start_mom () const;
-  virtual Pitch to_relative_octave (Pitch);
-  virtual void compress (Moment);
+  DECLARE_SCHEME_CALLBACK (length_callback, (SCM));
+  DECLARE_SCHEME_CALLBACK (start_callback, (SCM));
 };
 
-
-
-
 #endif /* MUSIC_WRAPPER_HH */