X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-scheme.cc;h=64866c75c75ceeabec734b9bf694c5b8c00008e8;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=42b6b50950bb013697ef5ac9744a7f7aefff2115;hpb=f4abbfff5f0d985a457e15586dbcc3ae473b0dee;p=lilypond.git

diff --git a/lily/music-scheme.cc b/lily/music-scheme.cc
index 42b6b50950..64866c75c7 100644
--- a/lily/music-scheme.cc
+++ b/lily/music-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
@@ -28,7 +28,7 @@ LY_DEFINE (ly_music_length, "ly:music-length",
            "Get the length of music expression @var{mus} and return"
            " it as a @code{Moment} object.")
 {
-  LY_ASSERT_TYPE (Music::unsmob, mus, 1);
+  LY_ASSERT_SMOB (Music, mus, 1);
   Music *sc = Music::unsmob (mus);
   return sc->get_length ().smobbed_copy ();
 }
@@ -39,7 +39,7 @@ LY_DEFINE (ly_music_property, "ly:music-property",
            " @var{mus}.  If no value is found, return @var{val} or"
            " @code{'()} if @var{val} is not specified.")
 {
-  LY_ASSERT_TYPE (Music::unsmob, mus, 1);
+  LY_ASSERT_SMOB (Music, mus, 1);
   return ly_prob_property (mus, sym, val);
 }
 
@@ -48,7 +48,7 @@ LY_DEFINE (ly_music_set_property_x, "ly:music-set-property!",
            "Set property @var{sym} in music expression @var{mus} to"
            " @var{val}.")
 {
-  LY_ASSERT_TYPE (Music::unsmob, mus, 1);
+  LY_ASSERT_SMOB (Music, mus, 1);
 
   return ly_prob_set_property_x (mus, sym, val);
 }
@@ -71,7 +71,7 @@ LY_DEFINE (ly_music_p, "ly:music?",
            1, 0, 0, (SCM obj),
            "Is @var{obj} a music object?")
 {
-  return scm_from_bool (Music::unsmob (obj));
+  return ly_bool2scm (Music::is_smob (obj));
 }
 
 LY_DEFINE (ly_event_p, "ly:event?",
@@ -92,7 +92,7 @@ LY_DEFINE (ly_music_mutable_properties, "ly:music-mutable-properties",
            "  The immutable properties are not available, since they are"
            " constant and initialized by the @code{make-music} function.")
 {
-  LY_ASSERT_TYPE (Music::unsmob, mus, 1);
+  LY_ASSERT_SMOB (Music, mus, 1);
   Music *m = Music::unsmob (mus);
   return m->get_property_alist (true);
 }
@@ -106,7 +106,7 @@ LY_DEFINE (ly_music_list_p, "ly:music-list?",
 
   while (scm_is_pair (lst))
     {
-      if (!Music::unsmob (scm_car (lst)))
+      if (!Music::is_smob (scm_car (lst)))
         return SCM_BOOL_F;
       lst = scm_cdr (lst);
     }
@@ -120,7 +120,7 @@ LY_DEFINE (ly_music_deep_copy, "ly:music-deep-copy",
            " @var{m} may be an arbitrary type; cons cells and music"
            " are copied recursively.")
 {
-  if (Music::unsmob (m))
+  if (Music::is_smob (m))
       return Music::unsmob (m)->clone ()->unprotect ();
   if (scm_is_pair (m))
     {
@@ -147,7 +147,7 @@ LY_DEFINE (ly_music_transpose, "ly:music-transpose",
            "Transpose @var{m} such that central@tie{}C is mapped"
            " to@tie{}@var{p}.  Return@tie{}@var{m}.")
 {
-  LY_ASSERT_TYPE (Music::unsmob, m, 1);
+  LY_ASSERT_SMOB (Music, m, 1);
   LY_ASSERT_SMOB (Pitch, p, 2);
 
   Music *sc = Music::unsmob (m);
@@ -165,8 +165,8 @@ LY_DEFINE (ly_music_compress, "ly:music-compress",
            2, 0, 0, (SCM m, SCM factor),
            "Compress music object@tie{}@var{m} by moment @var{factor}.")
 {
-  LY_ASSERT_TYPE (Music::unsmob, m, 1);
-  LY_ASSERT_TYPE (Moment::unsmob, factor, 2);
+  LY_ASSERT_SMOB (Music, m, 1);
+  LY_ASSERT_SMOB (Moment, factor, 2);
 
   Music *sc = Music::unsmob (m);
   sc->compress (*Moment::unsmob (factor));
@@ -178,8 +178,8 @@ LY_DEFINE (ly_make_music_relative_x, "ly:make-music-relative!",
            "Make @var{music} relative to @var{pitch},"
            " return final pitch.")
 {
-  LY_ASSERT_TYPE (Music::unsmob, music, 1);
-  LY_ASSERT_TYPE (Pitch::unsmob, pitch, 2);
+  LY_ASSERT_SMOB (Music, music, 1);
+  LY_ASSERT_SMOB (Pitch, pitch, 2);
 
   Pitch start = *Pitch::unsmob (pitch);
   Music *m = Music::unsmob (music);
@@ -193,7 +193,7 @@ LY_DEFINE (ly_music_duration_length, "ly:music-duration-length", 1, 0, 0,
            "Extract the duration field from @var{mus} and return the"
            " length.")
 {
-  LY_ASSERT_TYPE (Music::unsmob, mus, 1);
+  LY_ASSERT_SMOB (Music, mus, 1);
   Music *m = Music::unsmob (mus);
 
   Duration *d = Duration::unsmob (m->get_property ("duration"));
@@ -211,7 +211,7 @@ LY_DEFINE (ly_music_duration_compress, "ly:music-duration-compress", 2, 0, 0,
            "Compress @var{mus} by factor @var{fact}, which is a"
            " @code{Moment}.")
 {
-  LY_ASSERT_TYPE (Music::unsmob, mus, 1);
+  LY_ASSERT_SMOB (Music, mus, 1);
   LY_ASSERT_SMOB (Moment, fact, 2);
 
   Music *m = Music::unsmob (mus);