X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic.hh;h=b0f48371048a50bc6f4a3d953d89fc20828a88da;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=e3fdb3f83d761c7fc6429efe789cd4f86630159d;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git diff --git a/lily/include/music.hh b/lily/include/music.hh index e3fdb3f83d..b0f4837104 100644 --- a/lily/include/music.hh +++ b/lily/include/music.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Han-Wen Nienhuys + Copyright (C) 1997--2012 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 @@ -24,6 +24,7 @@ #include "moment.hh" #include "pitch.hh" #include "prob.hh" +#include "context.hh" #define is_mus_type(x) internal_is_music_type (ly_symbol2scm (x)) @@ -39,7 +40,7 @@ public: bool internal_is_music_type (SCM) const; - Stream_event *to_event () const; + Stream_event *to_event (Context *) const; DECLARE_SCHEME_CALLBACK (relative_callback, (SCM, SCM)); Pitch to_relative_octave (Pitch); @@ -53,12 +54,12 @@ public: /// Scale the music in time by #factor#. void compress (Moment factor); - + // Broadcast the event in a context's event-source. void send_to_context (Context *c); DECLARE_SCHEME_CALLBACK (duration_length_callback, (SCM)); - + protected: virtual SCM copy_mutable_properties () const; virtual void type_check_assignment (SCM, SCM) const;