X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fprob-scheme.cc;h=a9424da91f5479da82a5c9cf699dec332119e0f5;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=51bd53c48aa8b8629ee6e875180ab539b9686aa9;hpb=e7aa6c445f463844dbaa52d38ea4aac2882b5601;p=lilypond.git

diff --git a/lily/prob-scheme.cc b/lily/prob-scheme.cc
index 51bd53c48a..a9424da91f 100644
--- a/lily/prob-scheme.cc
+++ b/lily/prob-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--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
@@ -24,7 +24,7 @@ LY_DEFINE (ly_prob_set_property_x, "ly:prob-set-property!",
            "Set property @var{sym} of @var{obj} to @var{value}.")
 {
   LY_ASSERT_SMOB (Prob, obj, 1);
-  Prob *ps = unsmob_prob (obj);
+  Prob *ps = unsmob<Prob> (obj);
   LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
 
   ps->set_property (sym, value);
@@ -48,14 +48,14 @@ LY_DEFINE (ly_prob_property, "ly:prob-property",
            " @code{'()} if @var{val} is not specified.")
 {
   LY_ASSERT_SMOB (Prob, prob, 1);
-  Prob *ps = unsmob_prob (prob);
+  Prob *ps = unsmob<Prob> (prob);
   LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
 
-  if (val == SCM_UNDEFINED)
+  if (SCM_UNBNDP (val))
     val = SCM_EOL;
 
-  SCM retval = ps->internal_get_property (sym);
-  if (retval == SCM_EOL)
+  SCM retval = ps->get_property (sym);
+  if (scm_is_null (retval))
     return val;
   else
     return retval;
@@ -66,8 +66,8 @@ LY_DEFINE (ly_prob_type_p, "ly:prob-type?",
            (SCM obj, SCM type),
            "Is @var{obj} the specified prob-type?")
 {
-  Prob *prob = unsmob_prob (obj);
-  return scm_from_bool (prob && prob->type () == type);
+  Prob *prob = unsmob<Prob> (obj);
+  return scm_from_bool (prob && scm_is_eq (prob->type (), type));
 }
 
 LY_DEFINE (ly_make_prob, "ly:make-prob",
@@ -95,7 +95,7 @@ LY_DEFINE (ly_prob_mutable_properties, "ly:prob-mutable-properties",
            "Retrieve an alist of mutable properties.")
 {
   LY_ASSERT_SMOB (Prob, prob, 1);
-  Prob *ps = unsmob_prob (prob);
+  Prob *ps = unsmob<Prob> (prob);
   return ps->get_property_alist (true);
 }
 
@@ -105,7 +105,7 @@ LY_DEFINE (ly_prob_immutable_properties, "ly:prob-immutable-properties",
            "Retrieve an alist of immutable properties.")
 {
   LY_ASSERT_SMOB (Prob, prob, 1);
-  Prob *ps = unsmob_prob (prob);
+  Prob *ps = unsmob<Prob> (prob);
   return ps->get_property_alist (false);
 }