Release: bump Welcome versions.

[lilypond.git] / lily / include / music.hh

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 83cc5ff4c3148a4add8d1c7b165bc46a0bfe8829..af672a38d161915190f57cb97f15c476b9cd7184 100644 (file)
--- 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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--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
@@ -27,7 +27,13 @@
 
 #define is_mus_type(x) internal_is_music_type (ly_symbol2scm (x))
 
-class Music : public Prob
+struct Preinit_Music {
+  SCM length_callback_;
+  SCM start_callback_;
+  Preinit_Music ();
+};
+
+class Music : Preinit_Music, public Prob
 {
 public:
   Music (SCM init);
@@ -48,9 +54,6 @@ 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);
 
@@ -64,19 +67,15 @@ protected:
   virtual void type_check_assignment (SCM, SCM) const;
   virtual void derived_mark () const;
 protected:
-  SCM length_callback_;
-  SCM start_callback_;
   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 music_deep_copy (SCM m);
+void set_origin (SCM m, SCM origin);
+
 SCM ly_camel_case_2_lisp_identifier (SCM name_sym);
 
 extern SCM ly_music_p_proc;
 
-/* common transposition function for music and event */
-void transpose_mutable (SCM alist, Pitch delta);
-
 #endif /* MUSIC_HH */