X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic-wrapper.hh;h=a500b582c778f736aac3fa02d12d055e6df89dcc;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=26fea0ec7bec649bdb8e482bb6dc31f072194df0;hpb=ee0dca4cea06f2d354cb33d935033116e88a3dba;p=lilypond.git

diff --git a/lily/include/music-wrapper.hh b/lily/include/music-wrapper.hh
index 26fea0ec7b..a500b582c7 100644
--- a/lily/include/music-wrapper.hh
+++ b/lily/include/music-wrapper.hh
@@ -1,43 +1,33 @@
-/*   
-  music-wrapper.hh -- declare Music_wrapper
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1998--2015 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"
 
-/** 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
 {
-  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 duration () const;
-  virtual ~Music_wrapper ();
-  virtual Musical_pitch to_relative_octave (Musical_pitch);
-  
+  DECLARE_SCHEME_CALLBACK (length_callback, (SCM));
+  DECLARE_SCHEME_CALLBACK (start_callback, (SCM));
 };
 
-
-
-
 #endif /* MUSIC_WRAPPER_HH */