From 4e4d3566e1719bf1a9a5aa88a2712810dba15ed8 Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 27 Mar 2002 01:21:49 +0000 Subject: [PATCH] lilypond-1.5.21 --- lily/midi-def.cc | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/lily/midi-def.cc b/lily/midi-def.cc index 40a2d065b3..a0599d107f 100644 --- a/lily/midi-def.cc +++ b/lily/midi-def.cc @@ -22,8 +22,20 @@ Midi_def::Midi_def () int Midi_def::get_tempo_i (Moment one_beat_mom) { - Moment w = *unsmob_moment (scope_p_->scm_elem ("whole-in-seconds")); - Moment wholes_per_min = Moment (60) /w; + SCM wis = ly_symbol2scm ("whole-in-seconds"); + Moment *w = unsmob_moment (scope_p_->scm_elem (wis)); + + Moment wholes_per_min = Moment (60); + if (!w) + { + programming_error ("wholes-in-seconds not set."); + wholes_per_min /= 4; + } + else + { + wholes_per_min /= *w; + } + int beats_per_min = int ((wholes_per_min / one_beat_mom).main_part_); return int (beats_per_min); } -- 2.39.5