X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic-wrapper.hh;h=f4598592e50a5e7771bcbdcae1f1f9016140a384;hb=27945b310409e8e0e76ceffc5aa34851448239b8;hp=b5f274cad46c970d2e50cd1becfd41530e2ece04;hpb=1161a2b71bc32575ea9878a8631221edb8c03279;p=lilypond.git

diff --git a/lily/include/music-wrapper.hh b/lily/include/music-wrapper.hh
index b5f274cad4..f4598592e5 100644
--- a/lily/include/music-wrapper.hh
+++ b/lily/include/music-wrapper.hh
@@ -1,40 +1,33 @@
-/*   
-  music-wrapper.hh -- declare Music_wrapper
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1998--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #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 * element () const;
-  virtual void transpose (Pitch);
-
-  
-  VIRTUAL_COPY_CONS(Music);
-  virtual Moment length_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 */