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 7e87040acf417e6f214bff9f3ae8da4db47f5a03..94b2a3165ec91167899c2cc49849d432934dfafa 100644 (file)
--- a/lily/include/music-wrapper.hh
+++ b/lily/include/music-wrapper.hh
@@ -1,44 +1,22 @@
-/*   
+/*
   music-wrapper.hh -- declare Music_wrapper
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--1999 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 "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 Music_iterator* to_rhythm (Music_iterator*);
-  virtual void compress (Moment);
+  DECLARE_SCHEME_CALLBACK (length_callback, (SCM));
+  DECLARE_SCHEME_CALLBACK (start_callback, (SCM));
 };
 
-
-
-
 #endif /* MUSIC_WRAPPER_HH */