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

diff --git a/lily/include/music-wrapper.hh b/lily/include/music-wrapper.hh
index 989fb5fd0c..f4598592e5 100644
--- a/lily/include/music-wrapper.hh
+++ b/lily/include/music-wrapper.hh
@@ -1,33 +1,33 @@
-/*   
-  music-wrapper.hh -- declare Music_wrapper
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.ruu.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 "musical-pitch.hh"
+#include "lily-guile.hh"
 
-class Music_wrapper : public Music
+struct Music_wrapper
 {
 public:
-  Music * element_p_;
-  Music_wrapper (Music*);
-  virtual void transpose (Musical_pitch);
-  virtual void do_print () const;
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  VIRTUAL_COPY_CONS (Music_wrapper, Music);
-  Music_wrapper (Music_wrapper const&);
-  virtual MInterval time_int () const;
-  virtual ~Music_wrapper ();
+  DECLARE_SCHEME_CALLBACK (length_callback, (SCM));
+  DECLARE_SCHEME_CALLBACK (start_callback, (SCM));
 };
 
-
-
 #endif /* MUSIC_WRAPPER_HH */