X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic-wrapper.hh;h=18d885f423b4902a4b1a84799c2603014a81a692;hb=62a502b7a020a0414058b7bfda405f644e8261f5;hp=95d7f0bd84dde133dc280f7aee93170e3aedecb0;hpb=bb36bac02a64770871780231ecc709cb18b20932;p=lilypond.git

diff --git a/lily/include/music-wrapper.hh b/lily/include/music-wrapper.hh
index 95d7f0bd84..18d885f423 100644
--- a/lily/include/music-wrapper.hh
+++ b/lily/include/music-wrapper.hh
@@ -1,43 +1,22 @@
-/*   
+/*
   music-wrapper.hh -- declare Music_wrapper
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef MUSIC_WRAPPER_HH
 #define MUSIC_WRAPPER_HH
 
-#include "music.hh"
-#include "musical-pitch.hh"
-
-/** A Music that modifies an existing Music.  This data structure
-  corresponds to a production that takes a single Music argument,
-  
-  Music: STUFF Music 
+#include "lily-guile.hh"
 
-  */
-class Music_wrapper : public Music
+struct Music_wrapper
 {
-  Music * element_p_;
 public:
-  Music_wrapper (Music*);
-  Music * element_l () const;
-  virtual void transpose (Musical_pitch);
-  virtual void do_print () const;
-  
-  VIRTUAL_COPY_CONS(Music);
-  Music_wrapper (Music_wrapper const&);
-  virtual Moment length_mom () const;
-  virtual ~Music_wrapper ();
-  virtual Musical_pitch to_relative_octave (Musical_pitch);
-  virtual void compress (Moment);
+  DECLARE_SCHEME_CALLBACK (length_callback, (SCM));
+  DECLARE_SCHEME_CALLBACK (start_callback, (SCM));
 };
 
-
-
-
 #endif /* MUSIC_WRAPPER_HH */