Run `make grand-replace'.

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

diff --git a/lily/include/music-wrapper.hh b/lily/include/music-wrapper.hh
index ac7483f0ff803e4568b13151657a2a22942a3912..94b2a3165ec91167899c2cc49849d432934dfafa 100644 (file)
--- a/lily/include/music-wrapper.hh
+++ b/lily/include/music-wrapper.hh
@@ -1,33 +1,21 @@
-/*   
+/*
   music-wrapper.hh -- declare Music_wrapper
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2004 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 ();
-  VIRTUAL_COPY_CONSTRUCTOR (Music, Music_wrapper);
-
-  Music *element () const;
-  virtual Moment get_length () const;
-  virtual Moment start_mom () const;
+  DECLARE_SCHEME_CALLBACK (length_callback, (SCM));
+  DECLARE_SCHEME_CALLBACK (start_callback, (SCM));
 };
 
 #endif /* MUSIC_WRAPPER_HH */