X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=81f4a3d67f18e43b0ffb6038c38ea6c5a3556e33;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=629986d3463a479d0694bde8bfbb49288bef35f7;hpb=8848da24e00c75d7de626b2ecc409fb45e87ce4a;p=lilypond.git

diff --git a/lily/music.cc b/lily/music.cc
index 629986d346..81f4a3d67f 100644
--- 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--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 "duration.hh"
 #include "input.hh"
 #include "international.hh"
-#include "ly-smobs.icc"
 #include "main.hh"
 #include "music-sequence.hh"
 #include "score.hh"
@@ -91,13 +90,13 @@ Moment
 Music::get_length () const
 {
   SCM lst = get_property ("length");
-  if (unsmob_moment (lst))
-    return *unsmob_moment (lst);
+  if (Moment::is_smob (lst))
+    return *Moment::unsmob (lst);
 
   if (ly_is_procedure (length_callback_))
     {
       SCM res = scm_call_1 (length_callback_, self_scm ());
-      return *unsmob_moment (res);
+      return *Moment::unsmob (res);
     }
 
   return Moment (0);
@@ -110,7 +109,7 @@ Music::start_mom () const
   if (ly_is_procedure (lst))
     {
       SCM res = scm_call_1 (lst, self_scm ());
-      return *unsmob_moment (res);
+      return *Moment::unsmob (res);
     }
 
   Moment m;
@@ -134,7 +133,7 @@ Pitch
 Music::generic_to_relative_octave (Pitch last)
 {
   SCM elt = get_property ("element");
-  Pitch *old_pit = unsmob_pitch (get_property ("pitch"));
+  Pitch *old_pit = Pitch::unsmob (get_property ("pitch"));
   if (old_pit)
     {
       Pitch new_pit = *old_pit;
@@ -158,7 +157,7 @@ Music::generic_to_relative_octave (Pitch last)
       last = new_pit;
     }
 
-  if (Music *m = unsmob_music (elt))
+  if (Music *m = Music::unsmob (elt))
     last = m->to_relative_octave (last);
 
   (void) music_list_to_relative (get_property ("articulations"), last, true);
@@ -172,7 +171,7 @@ Music::to_relative_octave (Pitch last)
   SCM callback = get_property ("to-relative-callback");
   if (ly_is_procedure (callback))
     {
-      Pitch *p = unsmob_pitch (scm_call_2 (callback, self_scm (),
+      Pitch *p = Pitch::unsmob (scm_call_2 (callback, self_scm (),
                                            last.smobbed_copy ()));
       return *p;
     }
@@ -185,11 +184,11 @@ Music::compress (Moment factor)
 {
   SCM elt = get_property ("element");
 
-  if (Music *m = unsmob_music (elt))
+  if (Music *m = Music::unsmob (elt))
     m->compress (factor);
 
   compress_music_list (get_property ("elements"), factor);
-  Duration *d = unsmob_duration (get_property ("duration"));
+  Duration *d = Duration::unsmob (get_property ("duration"));
   if (d)
     set_property ("duration",
                   d->compressed (factor.main_part_).smobbed_copy ());
@@ -208,7 +207,7 @@ transpose_mutable (SCM alist, Pitch delta)
       SCM val = scm_cdr (entry);
       SCM new_val = val;
 
-      if (Pitch *p = unsmob_pitch (val))
+      if (Pitch *p = Pitch::unsmob (val))
         {
           Pitch transposed = p->transposed (delta);
 
@@ -220,7 +219,7 @@ transpose_mutable (SCM alist, Pitch delta)
         }
       else if (prop == ly_symbol2scm ("element"))
         {
-          if (Music *m = unsmob_music (val))
+          if (Music *m = Music::unsmob (val))
             m->transpose (delta);
         }
       else if (prop == ly_symbol2scm ("elements")
@@ -247,13 +246,13 @@ Music::transpose (Pitch delta)
 void
 Music::set_spot (Input ip)
 {
-  set_property ("origin", make_input (ip));
+  set_property ("origin", ip.smobbed_copy ());
 }
 
 Input *
 Music::origin () const
 {
-  Input *ip = unsmob_input (get_property ("origin"));
+  Input *ip = Input::unsmob (get_property ("origin"));
   return ip ? ip : &dummy_input_global;
 }
 
@@ -283,7 +282,7 @@ Music::to_event () const
       SCM art_ev = SCM_EOL;
       for (; scm_is_pair (art_mus); art_mus = scm_cdr (art_mus))
         {
-          Music *m = unsmob_music (scm_car (art_mus));
+          Music *m = Music::unsmob (scm_car (art_mus));
           art_ev = scm_cons (m->to_event ()->unprotect (), art_ev);
         }
       e->set_property ("articulations", scm_reverse_x (art_ev, SCM_EOL));
@@ -313,7 +312,7 @@ make_music_by_name (SCM sym)
   SCM rv = scm_call_1 (make_music_proc, sym);
 
   /* UGH. */
-  Music *m = unsmob_music (rv);
+  Music *m = Music::unsmob (rv);
   m->protect ();
   return m;
 }
@@ -322,17 +321,11 @@ MAKE_SCHEME_CALLBACK (Music, duration_length_callback, 1);
 SCM
 Music::duration_length_callback (SCM m)
 {
-  Music *me = unsmob_music (m);
-  Duration *d = unsmob_duration (me->get_property ("duration"));
+  Music *me = Music::unsmob (m);
+  Duration *d = Duration::unsmob (me->get_property ("duration"));
 
   Moment mom;
   if (d)
     mom = d->get_length ();
   return mom.smobbed_copy ();
 }
-
-Music *
-unsmob_music (SCM m)
-{
-  return dynamic_cast<Music *> (unsmob_prob (m));
-}