Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

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

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 8cb69d0700b724e91f7b62f51d12074f86ec7caa..af672a38d161915190f57cb97f15c476b9cd7184 100644 (file)
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -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);
@@ -47,15 +53,6 @@ public:
   Moment get_length () const;
   Moment start_mom () const;
   void print () const;
-  static Music *unsmob (SCM m) {
-    return dynamic_cast <Music *> (Prob::unsmob (m));
-  }
-  static bool is_smob (SCM m) {
-    return Prob::is_smob (m) && unsmob (m);
-  }
-
-  /// Transpose, with the interval central C to #p#
-  void transpose (Pitch p);
 
   /// Scale the music in time by #factor#.
   void compress (Moment factor);
@@ -70,18 +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 *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 */