X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdrum-note-performer.cc;h=0285de650478c880493963c576389112057058c5;hb=555eba6c5d21610b1ad87a68a4304946212fb69d;hp=44a624313b803c8900097ad6dd271b9b5d91b29a;hpb=f4abbfff5f0d985a457e15586dbcc3ae473b0dee;p=lilypond.git

diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc
index 44a624313b..0285de6504 100644
--- a/lily/drum-note-performer.cc
+++ b/lily/drum-note-performer.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2014 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1996--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -55,10 +55,10 @@ Drum_note_performer::process_music ()
       SCM defn = SCM_EOL;
 
       if (scm_is_symbol (sym)
-          && (scm_hash_table_p (tab) == SCM_BOOL_T))
+          && to_boolean (scm_hash_table_p (tab)))
         defn = scm_hashq_ref (tab, sym, SCM_EOL);
 
-      if (Pitch *pit = Pitch::unsmob (defn))
+      if (Pitch *pit = unsmob<Pitch> (defn))
         {
           SCM articulations = n->get_property ("articulations");
           Stream_event *tie_event = 0;
@@ -66,7 +66,7 @@ Drum_note_performer::process_music ()
           int velocity = 0;
           for (SCM s = articulations; scm_is_pair (s); s = scm_cdr (s))
             {
-              Stream_event *ev = Stream_event::unsmob (scm_car (s));
+              Stream_event *ev = unsmob<Stream_event> (scm_car (s));
               if (!ev)
                 continue;