Merge branch 'issue4032'

[lilypond.git] / lily / stream-event.cc

diff --git a/lily/stream-event.cc b/lily/stream-event.cc
index 117559b87c52871bca8d5739b22f1dcf122265c6..f8c9f8fc8b619235eb78baa87cf314a5381ac163 100644 (file)
--- a/lily/stream-event.cc
+++ b/lily/stream-event.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2012 Erik Sandberg  <mandolaerik@gmail.com>
+  Copyright (C) 2005--2014 Erik Sandberg  <mandolaerik@gmail.com>
 
   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,7 +55,7 @@ Stream_event::copy_mutable_properties () const
 Input *
 Stream_event::origin () const
 {
-  Input *i = unsmob_input (get_property ("origin"));
+  Input *i = Input::unsmob (get_property ("origin"));
   return i ? i : &dummy_input_global;
 }
 
@@ -69,7 +69,6 @@ bool
 Stream_event::internal_in_event_class (SCM class_name)
 {
   SCM cl = get_property ("class");
-  cl = scm_call_1 (ly_lily_module_constant ("ly:make-event-class"), cl);
   return scm_c_memq (class_name, cl) != SCM_BOOL_F;
 }
 
@@ -88,21 +87,20 @@ Stream_event::make_transposable ()
       SCM prop = scm_car (entry);
       SCM val = scm_cdr (entry);
 
-      if ((unsmob_pitch (val)
-          || (prop == ly_symbol2scm ("element") && unsmob_music (val))
-          || (prop == ly_symbol2scm ("elements") && scm_is_pair (val))
-          || (prop == ly_symbol2scm ("pitch-alist") && scm_is_pair (val)))
-         && scm_is_false (scm_assq (prop, mutable_property_alist_)))
-       mutable_property_alist_ =
-         scm_acons (prop, ly_music_deep_copy (val), mutable_property_alist_);
+      if ((Pitch::unsmob (val)
+           || (prop == ly_symbol2scm ("element") && Music::unsmob (val))
+           || (prop == ly_symbol2scm ("elements") && scm_is_pair (val))
+           || (prop == ly_symbol2scm ("pitch-alist") && scm_is_pair (val)))
+          && scm_is_false (scm_assq (prop, mutable_property_alist_)))
+        mutable_property_alist_
+          = scm_acons (prop, ly_music_deep_copy (val), mutable_property_alist_);
     }
 }
 
-
 SCM
 Stream_event::dump (SCM self)
 {
-  Stream_event *ev = unsmob_stream_event (self);
+  Stream_event *ev = Stream_event::unsmob (self);
   // Reversed alists look prettier.
   return scm_cons (scm_reverse (ev->immutable_property_alist_),
                    scm_reverse (ev->mutable_property_alist_));
@@ -118,7 +116,7 @@ Stream_event::undump (SCM data)
 }
 
 Stream_event *
-unsmob_stream_event (SCM m)
+Stream_event::unsmob (SCM m)
 {
-  return dynamic_cast<Stream_event *> (unsmob_prob (m));
+  return dynamic_cast<Stream_event *> (Prob::unsmob (m));
 }