Web: Aurélien Bello's Der Rosenkavalier

[lilypond.git] / lily / music.cc

diff --git a/lily/music.cc b/lily/music.cc
index 31bda8a26397208a73e711c911cfb3d67070475d..81f4a3d67f18e43b0ffb6038c38ea6c5a3556e33 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 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 "duration.hh"
 #include "input.hh"
 #include "international.hh"
-#include "ly-smobs.icc"
 #include "main.hh"
 #include "music-sequence.hh"
 #include "score.hh"
@@ -91,7 +90,7 @@ Moment
 Music::get_length () const
 {
   SCM lst = get_property ("length");
-  if (Moment::unsmob (lst))
+  if (Moment::is_smob (lst))
     return *Moment::unsmob (lst);
 
   if (ly_is_procedure (length_callback_))
@@ -247,7 +246,7 @@ Music::transpose (Pitch delta)
 void
 Music::set_spot (Input ip)
 {
-  set_property ("origin", make_input (ip));
+  set_property ("origin", ip.smobbed_copy ());
 }
 
 Input *
@@ -330,9 +329,3 @@ Music::duration_length_callback (SCM m)
     mom = d->get_length ();
   return mom.smobbed_copy ();
 }
-
-Music *
-Music::unsmob (SCM m)
-{
-  return dynamic_cast<Music *> (Prob::unsmob (m));
-}