Web-ja: update introduction

[lilypond.git] / lily / music-function-scheme.cc

diff --git a/lily/music-function-scheme.cc b/lily/music-function-scheme.cc
index e9e9a68ec6f696859e3c66e3e3fe2dd778cc50e2..5246b6dbe6282c3dc0e67e41c74611d3a49e9d5c 100644 (file)
--- a/lily/music-function-scheme.cc
+++ b/lily/music-function-scheme.cc
@@ -1,28 +1,21 @@
 #include "music-function.hh"
 
-LY_DEFINE (ly_music_function_p, "ly:music-function?", 1, 0, 0,
-           (SCM x),
-           "Is @var{x} a @code{music-function}?")
-{
-  return is_music_function (x) ? SCM_BOOL_T : SCM_BOOL_F;
-}
-
 LY_DEFINE (ly_music_function_extract, "ly:music-function-extract", 1, 0, 0,
            (SCM x),
            "Return the Scheme function inside@tie{}@var{x}.")
 {
-  LY_ASSERT_TYPE (is_music_function, x, 1);
+  LY_ASSERT_SMOB (Music_function, x, 1);
 
-  return get_music_function_transform (x);
+  return unsmob<Music_function> (x)->get_function ();
 }
 
 LY_DEFINE (ly_music_function_signature, "ly:music-function-signature", 1, 0, 0,
            (SCM x),
            "Return the function signature inside@tie{}@var{x}.")
 {
-  LY_ASSERT_TYPE (is_music_function, x, 1);
+  LY_ASSERT_SMOB (Music_function, x, 1);
 
-  return get_music_function_signature (x);
+  return unsmob<Music_function> (x)->get_signature ();
 }
 
 LY_DEFINE (ly_make_music_function, "ly:make-music-function", 2, 0, 0,
@@ -48,5 +41,5 @@ LY_DEFINE (ly_make_music_function, "ly:make-music-function", 2, 0, 0,
         }
     }
 
-  return make_music_function (signature, func);
+  return Music_function::make_smob (signature, func);
 }