X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstream-event.cc;h=674f22fda4d3c423141c88ba12fd4fdc52ea9523;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=ef801efc621d7c3b9befefcceade4795e23a5bcd;hpb=bdf74886dc9bcaf01c55677bf2086f4b76a7ef8c;p=lilypond.git

diff --git a/lily/stream-event.cc b/lily/stream-event.cc
index ef801efc62..674f22fda4 100644
--- 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--2015 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
@@ -19,7 +19,6 @@
 
 #include "stream-event.hh"
 
-#include "ly-smobs.icc"
 #include "context.hh"
 #include "input.hh"
 #include "music.hh"
@@ -55,21 +54,20 @@ 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;
 }
 
 void
 Stream_event::set_spot (Input *i)
 {
-  set_property ("origin", make_input (*i));
+  set_property ("origin", i->smobbed_copy ());
 }
 
 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,8 +86,8 @@ 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))
+      if ((Pitch::is_smob (val)
+           || (prop == ly_symbol2scm ("element") && Music::is_smob (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_)))
@@ -101,7 +99,7 @@ Stream_event::make_transposable ()
 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_));
@@ -115,9 +113,3 @@ Stream_event::undump (SCM data)
   obj->mutable_property_alist_ = scm_reverse (scm_cdr (data));
   return obj->unprotect ();
 }
-
-Stream_event *
-unsmob_stream_event (SCM m)
-{
-  return dynamic_cast<Stream_event *> (unsmob_prob (m));
-}