X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic.hh;h=32ca55babcdfaa9deff2d17706728d0f8e529961;hb=84a3f805e16aeec81ea36e33fa7e7e069ecec9f9;hp=f7e4407f3ba186ec45e1b58c1823791f040ffacf;hpb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;p=lilypond.git

diff --git a/lily/include/music.hh b/lily/include/music.hh
index f7e4407f3b..32ca55babc 100644
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -1,9 +1,20 @@
 /*
-  music.hh -- declare Music
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 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_HH
@@ -16,9 +27,10 @@
 
 #define is_mus_type(x) internal_is_music_type (ly_symbol2scm (x))
 
-class Music : public Prob
+class Music : public Preinit<Music>, public Prob
 {
 public:
+  void pre_init ();
   Music (SCM init);
   Music (Music const &m);
   VIRTUAL_COPY_CONSTRUCTOR (Music, Music);
@@ -37,17 +49,14 @@ public:
   Moment start_mom () const;
   void print () const;
 
-  /// Transpose, with the interval central C to #p#
-  void transpose (Pitch p);
-
   /// 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;
@@ -58,14 +67,12 @@ protected:
   friend SCM ly_extended_make_music (SCM, SCM);
 };
 
-Music *unsmob_music (SCM);
 Music *make_music_by_name (SCM sym);
-SCM ly_music_deep_copy (SCM);
-SCM ly_camel_case_to_lisp_identifier (SCM name_sym);
+SCM music_deep_copy (SCM m);
+void set_origin (SCM m, SCM origin);
 
-extern SCM ly_music_p_proc;
+SCM ly_camel_case_2_lisp_identifier (SCM name_sym);
 
-/* common transposition function for music and event */
-SCM transpose_mutable (SCM alist, Pitch delta);
+extern SCM ly_music_p_proc;
 
 #endif /* MUSIC_HH */