X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic-wrapper.hh;h=fcf42283f3a94bec93d659c34064101a576e8a8a;hb=e7aa6c445f463844dbaa52d38ea4aac2882b5601;hp=f01a39ff9aa055caa4e57f68b5c40fae02f8921b;hpb=339ea28cd7e4f8a1c1ca7c1d4dfe803a3f4c03e6;p=lilypond.git diff --git a/lily/include/music-wrapper.hh b/lily/include/music-wrapper.hh index f01a39ff9a..fcf42283f3 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--1999 Han-Wen Nienhuys - - */ +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 1998--2014 Han-Wen Nienhuys + + 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 . +*/ #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 length_mom () const; - virtual ~Music_wrapper (); - virtual Musical_pitch to_relative_octave (Musical_pitch); - virtual void compress (Moment); + DECLARE_SCHEME_CALLBACK (length_callback, (SCM)); + DECLARE_SCHEME_CALLBACK (start_callback, (SCM)); }; - - - #endif /* MUSIC_WRAPPER_HH */