* The grand 2005-2006 replace.

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

diff --git a/lily/include/music-wrapper.hh b/lily/include/music-wrapper.hh
index 68f9d9a8d0d214e93b4350093e13161572d42ff2..cedbcf3017520fabe38de002eea8003df1f9bb9c 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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef MUSIC_WRAPPER_HH
 #define MUSIC_WRAPPER_HH
 
-#include "music.hh"
-#include "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
 {
 public:
-  Music_wrapper (SCM);
-  VIRTUAL_COPY_CONSTRUCTOR (Music, Music_wrapper);
-  DECLARE_SCHEME_CALLBACK(length_callback,(SCM));
-  DECLARE_SCHEME_CALLBACK(start_callback, (SCM));
-  
-  Music *element () const;
+  DECLARE_SCHEME_CALLBACK (length_callback, (SCM));
+  DECLARE_SCHEME_CALLBACK (start_callback, (SCM));
 };
 
 #endif /* MUSIC_WRAPPER_HH */