source file of the GNU LilyPond music typesetter
- (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "music.hh"
-
+#include "music-sequence.hh"
#include "duration.hh"
#include "input-smob.hh"
#include "ly-smobs.icc"
#include "main.hh"
-#include "music-list.hh"
#include "pitch.hh"
#include "score.hh"
#include "warn.hh"
+/*
+ Music is anything that has duration and supports both time compression
+ and transposition.
+
+ In Lily, everything that can be thought to have a length and a pitch
+ (which has a duration which can be transposed) is considered "music",
+*/
bool
Music::internal_is_music_type (SCM k) const
{
smobify_self ();
length_callback_ = get_property ("length-callback");
+ start_callback_ = get_property ("start-callback");
}
Music::Music (Music const &m)
smobify_self ();
mutable_property_alist_ = ly_music_deep_copy (m.mutable_property_alist_);
length_callback_ = m.length_callback_;
+ start_callback_ = m.start_callback_;
set_spot (*m.origin ());
}
SCM
Music::mark_smob (SCM m)
{
- Music *mus = (Music*) SCM_CELL_WORD_1 (m);
+ Music *mus = (Music *) SCM_CELL_WORD_1 (m);
scm_gc_mark (mus->immutable_property_alist_);
scm_gc_mark (mus->mutable_property_alist_);
return SCM_EOL;
return *unsmob_moment (res);
}
- return *unsmob_moment (scm_call_1 (length_callback_, self_scm ()));
+ return Moment (0);
}
Moment
Music::start_mom () const
{
- SCM lst = get_property ("start-moment-function");
+ SCM lst = get_property ("start-callback");
if (ly_c_procedure_p (lst))
{
SCM res = scm_call_1 (lst, self_scm ());
Music::print_smob (SCM s, SCM p, scm_print_state*)
{
scm_puts ("#<Music ", p);
- Music* m = unsmob_music (s);
+ Music *m = unsmob_music (s);
SCM nm = m->get_property ("name");
if (scm_is_symbol (nm) || scm_is_string (nm))
scm_display (nm, p);
else
- scm_puts (classname (m),p);
+ scm_puts (classname (m), p);
/* Printing properties takes a lot of time, especially during backtraces.
For inspecting, it is better to explicitly use an inspection
function. */
- scm_puts (">",p);
+ scm_puts (">", p);
return 1;
}
Pitch
-Music::to_relative_octave (Pitch p)
+Music::generic_to_relative_octave (Pitch last)
{
SCM elt = get_property ("element");
+ Pitch *old_pit = unsmob_pitch (get_property ("pitch"));
+ if (old_pit)
+ {
+ Pitch new_pit = *old_pit;
+ new_pit = new_pit.to_relative_octave (last);
+
+ SCM check = get_property ("absolute-octave");
+ if (scm_is_number (check)
+ && new_pit.get_octave () != scm_to_int (check))
+ {
+ Pitch expected_pit (scm_to_int (check),
+ new_pit.get_notename (),
+ new_pit.get_alteration ());
+ origin ()->warning (_f ("octave check failed; expected %s, found: %s",
+ expected_pit.to_string (),
+ new_pit.to_string ()));
+ new_pit = expected_pit;
+ }
+
+ set_property ("pitch", new_pit.smobbed_copy ());
+
+ last = new_pit;
+ }
if (Music *m = unsmob_music (elt))
- p = m->to_relative_octave (p);
+ last = m->to_relative_octave (last);
+
+ last = music_list_to_relative (get_property ("elements"), last, false);
+ return last;
+}
+
+Pitch
+Music::to_relative_octave (Pitch last)
+{
+ SCM callback = get_property ("to-relative-callback");
+ if (ly_c_procedure_p (callback))
+ {
+ Pitch *p = unsmob_pitch (scm_call_2 (callback, self_scm (), last.smobbed_copy ()));
+ return *p;
+ }
- p = music_list_to_relative (get_property ("elements"), p, false);
- return p;
+ return generic_to_relative_octave (last);
}
void
m->compress (factor);
compress_music_list (get_property ("elements"), factor);
+ Duration *d = unsmob_duration (get_property ("duration"));
+ if (d)
+ set_property ("duration", d->compressed (factor.main_part_).smobbed_copy ());
}
void
Music::transpose (Pitch delta)
{
+ if (to_boolean (get_property ("untransposable")))
+ return;
+
for (SCM s = this->get_property_alist (true); scm_is_pair (s); s = scm_cdr (s))
{
SCM entry = scm_car (s);
SCM val = scm_cdr (entry);
- if (Pitch * p = unsmob_pitch (val))
+ if (Pitch *p = unsmob_pitch (val))
{
- Pitch transposed = p->transposed (delta);
+ Pitch transposed = p->transposed (delta);
scm_set_cdr_x (entry, transposed.smobbed_copy ());
if (abs (transposed.get_alteration ()) > DOUBLE_SHARP)
{
- warning (_f ("Transposition by %s makes alteration larger than two",
+ warning (_f ("transposition by %s makes alteration larger than double",
delta.to_string ()));
}
}
}
-
+
SCM elt = get_property ("element");
- if (Music* m = unsmob_music (elt))
+ if (Music *m = unsmob_music (elt))
m->transpose (delta);
transpose_music_list (get_property ("elements"), delta);
+
+ /*
+ UGH - how do this more generically?
+ */
+ SCM pa = get_property ("pitch-alist");
+ if (scm_is_pair (pa))
+ {
+ set_property ("pitch-alist", ly_transpose_key_alist (pa, delta.smobbed_copy ()));
+ }
}
IMPLEMENT_TYPE_P (Music, "ly:music?");
set_property ("origin", make_input (ip));
}
-Input*
+Input *
Music::origin () const
{
Input *ip = unsmob_input (get_property ("origin"));
- return ip ? ip : & dummy_input_global;
+ return ip ? ip : &dummy_input_global;
}
int
return 0;
}
-Music*
+Music *
make_music_by_name (SCM sym)
{
SCM make_music_proc = ly_lily_module_constant ("make-music");
projects / lilypond.git / blobdiff