X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic.hh;h=8cb69d0700b724e91f7b62f51d12074f86ec7caa;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=b0f48371048a50bc6f4a3d953d89fc20828a88da;hpb=caac677710724849651381d11577f61dd9618bcf;p=lilypond.git

diff --git a/lily/include/music.hh b/lily/include/music.hh
index b0f4837104..8cb69d0700 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--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
@@ -24,7 +24,6 @@
 #include "moment.hh"
 #include "pitch.hh"
 #include "prob.hh"
-#include "context.hh"
 
 #define is_mus_type(x) internal_is_music_type (ly_symbol2scm (x))
 
@@ -40,7 +39,7 @@ public:
 
   bool internal_is_music_type (SCM) const;
 
-  Stream_event *to_event (Context *) const;
+  Stream_event *to_event () const;
 
   DECLARE_SCHEME_CALLBACK (relative_callback, (SCM, SCM));
   Pitch to_relative_octave (Pitch);
@@ -48,6 +47,12 @@ 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);
@@ -70,7 +75,6 @@ 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_2_lisp_identifier (SCM name_sym);