X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=0431981eb65a46b3543acd02b9c8af0c78dc1e06;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=5caf42f221838eebbcd28fd7c5bd4d3c957f5a3a;hpb=82bc9ad690e201aaa55694f8b92261ae7338f56a;p=lilypond.git

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 5caf42f221..0431981eb6 100644
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.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
@@ -68,7 +68,7 @@ Note_heads_engraver::process_music ()
       Stream_event *ev = note_evs_[i];
       Item *note = make_item ("NoteHead", ev->self_scm ());
 
-      Pitch *pit = unsmob_pitch (ev->get_property ("pitch"));
+      Pitch *pit = Pitch::unsmob (ev->get_property ("pitch"));
 
 #if 0 /* TODO: should have a mechanism to switch off these warnings. */
 
@@ -99,9 +99,9 @@ Note_heads_engraver::process_music ()
       if (scm_is_vector (shape_vector))
         {
           SCM scm_tonic = get_property ("tonic");
-          Pitch tonic (0, 0, 0);
-          if (unsmob_pitch (scm_tonic))
-            tonic = *unsmob_pitch (scm_tonic);
+          Pitch tonic;
+          if (Pitch::is_smob (scm_tonic))
+            tonic = *Pitch::unsmob (scm_tonic);
 
           unsigned int delta = (pit->get_notename () - tonic.get_notename () + 7) % 7;