X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstream-event-scheme.cc;h=c1d0543f8c44ef3081ad5b58be0e759d40404825;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=0ff9938863329ca0b289d60966b3a8307508a90e;hpb=4bb29573149a0ffa1f881c5e38a0fe68e9e76b67;p=lilypond.git

diff --git a/lily/stream-event-scheme.cc b/lily/stream-event-scheme.cc
index 0ff9938863..c1d0543f8c 100644
--- a/lily/stream-event-scheme.cc
+++ b/lily/stream-event-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2006--2011 Erik Sandberg  <mandolaerik@gmail.com>
+  Copyright (C) 2006--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
@@ -23,7 +23,7 @@ LY_DEFINE (ly_stream_event_p, "ly:stream-event?",
            1, 0, 0, (SCM obj),
            "Is @code{@var{obj}} a @code{Stream_event} object?")
 {
-  return scm_from_bool (unsmob_stream_event (obj));
+  return scm_from_bool (Stream_event::is_smob (obj));
 }
 
 LY_DEFINE (ly_make_stream_event, "ly:make-stream-event",
@@ -31,7 +31,7 @@ LY_DEFINE (ly_make_stream_event, "ly:make-stream-event",
            "Create a stream event of class @var{cl} with the given"
            " mutable property list.")
 {
-  LY_ASSERT_TYPE (ly_is_symbol, cl, 1);
+  LY_ASSERT_TYPE (ly_is_pair, cl, 1);
 
   /* should be scm_list_p, but scm_list_p is expensive. */
   LY_ASSERT_TYPE (scm_is_pair, proplist, 2);
@@ -44,23 +44,20 @@ LY_DEFINE (ly_make_stream_event, "ly:make-stream-event",
 }
 
 LY_DEFINE (ly_event_property, "ly:event-property",
-           2, 0, 0, (SCM sev, SCM sym),
-           "Get the property @var{sym} of stream event @var{mus}."
-           "  If @var{sym} is undefined, return @code{'()}.")
+           2, 1, 0, (SCM sev, SCM sym, SCM val),
+           "Get the property @var{sym} of stream event @var{sev}."
+           "  If @var{sym} is undefined, return @var{val} or"
+           " @code{'()} if @var{val} is not specified.")
 {
-  LY_ASSERT_TYPE (unsmob_stream_event, sev, 1);
-  LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
-
-  Stream_event *e = unsmob_stream_event (sev);
-
-  return e->internal_get_property (sym);
+  LY_ASSERT_SMOB (Stream_event, sev, 1)
+  return ly_prob_property (sev, sym, val);
 }
 
 LY_DEFINE (ly_event_set_property_x, "ly:event-set-property!",
            3, 0, 0, (SCM ev, SCM sym, SCM val),
            "Set property @var{sym} in event @var{ev} to @var{val}.")
 {
-  LY_ASSERT_TYPE (unsmob_stream_event, ev, 1);
+  LY_ASSERT_SMOB (Stream_event, ev, 1);
   LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
 
   return ly_prob_set_property_x (ev, sym, val);
@@ -71,7 +68,7 @@ LY_DEFINE (ly_event_deep_copy, "ly:event-deep-copy",
            "Copy @var{m} and all sub expressions of@tie{}@var{m}.")
 {
   SCM copy = m;
-  if (Stream_event *ev = unsmob_stream_event (m))
+  if (Stream_event *ev = Stream_event::unsmob (m))
     {
       ev = ev->clone ();
       copy = ev->unprotect ();