source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "music.hh"
{
SCM nm = get_property ("name");
if (scm_is_symbol (nm))
- {
- return ly_symbol2string (nm);
- }
+ return ly_symbol2string (nm);
else
- {
- return classname (this);
- }
+ return "Music";
}
Music::Music (SCM init)
length_callback_ = get_property ("length-callback");
if (!ly_is_procedure (length_callback_))
- {
- length_callback_ = duration_length_callback_proc;
- }
-
+ length_callback_ = duration_length_callback_proc;
+
start_callback_ = get_property ("start-callback");
}
{
}
-
SCM
Music::get_property_alist (bool m) const
{
if (scm_is_symbol (nm) || scm_is_string (nm))
scm_display (nm, p);
else
- scm_puts (classname (m), p);
+ scm_puts ("Music", p);
/* Printing properties takes a lot of time, especially during backtraces.
For inspecting, it is better to explicitly use an inspection
*/
SCM pa = get_property ("pitch-alist");
if (scm_is_pair (pa))
- {
- set_property ("pitch-alist", ly_transpose_key_alist (pa, delta.smobbed_copy ()));
- }
+ set_property ("pitch-alist", ly_transpose_key_alist (pa, delta.smobbed_copy ()));
}
IMPLEMENT_TYPE_P (Music, "ly:music?");
return (s == SCM_BOOL_F) ? SCM_EOL : scm_cdr (s);
}
-
SCM
Music::internal_get_object (SCM s) const
{
void
Music::internal_set_object (SCM s, SCM v)
{
- return internal_set_property (s,v);
+ return internal_set_property (s, v);
}
void
SCM rv = scm_call_1 (make_music_proc, sym);
/* UGH. */
- scm_gc_protect_object (rv);
- return unsmob_music (rv);
+ Music *m = unsmob_music (rv);
+ m->protect ();
+ return m;
}
-
MAKE_SCHEME_CALLBACK (Music, duration_length_callback, 1);
SCM
Music::duration_length_callback (SCM m)
Moment mom;
if (d)
- {
- mom = d->get_length ();
- }
+ mom = d->get_length ();
return mom.smobbed_copy ();
}