(c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "main.hh"
+#include "duration.hh"
#include "input-smob.hh"
-#include "music.hh"
-#include "music-list.hh"
-#include "warn.hh"
-#include "pitch.hh"
#include "ly-smobs.icc"
#include "main.hh"
-
+#include "music-list.hh"
+#include "music.hh"
+#include "pitch.hh"
+#include "score.hh"
+#include "warn.hh"
bool
Music::internal_is_music_type (SCM k) const
Music::name () const
{
SCM nm = get_property ("name");
- if (is_symbol (nm))
+ if (ly_c_symbol_p (nm))
{
return ly_symbol2string (nm);
}
SCM lst = get_property ("length");
if (unsmob_moment (lst))
return *unsmob_moment (lst);
- else if (is_procedure (lst))
+ else if (ly_c_procedure_p (lst))
{
SCM res = scm_call_1 (lst, self_scm ());
return *unsmob_moment (res);
Music::start_mom () const
{
SCM lst = get_property ("start-moment-function");
- if (is_procedure (lst))
+ if (ly_c_procedure_p (lst))
{
SCM res = scm_call_1 (lst, self_scm ());
return *unsmob_moment (res);
Music* m = unsmob_music (s);
SCM nm = m->get_property ("name");
- if (is_symbol (nm) || ly_c_string_p (nm))
+ if (ly_c_symbol_p (nm) || ly_c_string_p (nm))
scm_display (nm, p);
else
scm_puts (classname (m),p);
return ip ? ip : & dummy_input_global;
}
+int
+Music::duration_log () const
+{
+ if (is_mus_type ("rhythmic-event"))
+ return unsmob_duration (get_property ("duration"))->duration_log ();
+ return 0;
+}
+
+Music*
+make_music_by_name (SCM sym)
+{
+ SCM make_music_proc = ly_scheme_function ("make-music");
+ SCM rv = scm_call_1 (make_music_proc, sym);
+
+ /* UGH. */
+ scm_gc_protect_object (rv);
+ return unsmob_music (rv);
+}
+
LY_DEFINE (ly_music_length, "ly:music-length",
1, 0, 0, (SCM mus),
"Get the length of music expression @var{mus}, and return as a @code{Moment} object.")
{
Music * sc = unsmob_music (mus);
SCM_ASSERT_TYPE (sc, mus, SCM_ARG1, __FUNCTION__, "music");
- SCM_ASSERT_TYPE (is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
+ SCM_ASSERT_TYPE (ly_c_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
return sc->internal_get_property (sym);
}
{
Music * sc = unsmob_music (mus);
SCM_ASSERT_TYPE (sc, mus, SCM_ARG1, __FUNCTION__, "music");
- SCM_ASSERT_TYPE (is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
+ SCM_ASSERT_TYPE (ly_c_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
bool ok = type_check_assignment (sym, val, ly_symbol2scm ("music-type?"));
if (ok)
return sc->self_scm ();
}
-Music*
-make_music_by_name (SCM sym)
+LY_DEFINE (ly_music_scorify, "ly:music-scorify",
+ 1, 0, 0,
+ (SCM music),
+ "Return MUSIC encapsulated in SCORE.")
{
- SCM make_music_proc = ly_scheme_function ("make-music");
- SCM rv = scm_call_1 (make_music_proc, sym);
-
- /* UGH. */
- scm_gc_protect_object (rv);
- return unsmob_music (rv);
+#if 0
+ SCM_ASSERT_TYPE (ly_c_music_p (music), music, SCM_ARG1, __FUNCTION__, "music");
+#endif
+ Score *score = new Score;
+
+ /* URG? */
+ SCM check_funcs = ly_scheme_function ("toplevel-music-functions");
+ for (; ly_c_pair_p (check_funcs); check_funcs = ly_cdr (check_funcs))
+ music = scm_call_1 (ly_car (check_funcs), music);
+
+ score->music_ = music;
+ scm_gc_unprotect_object (score->self_scm ());
+ return score->self_scm ();
}
-