From 6b49c466667e6b916a3d16c644231bdf60b64edd Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 28 Aug 2005 23:12:13 +0000
Subject: [PATCH] * lily/tempo-performer.cc (process_music): idem.
* lily/midi-def.cc (get_tempo): Rational to int conversion bug.
---
ChangeLog | 8 +++++++-
lily/midi-def.cc | 4 ++--
lily/tempo-performer.cc | 2 +-
scm/define-grobs.scm | 3 ++-
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index eec9d4fb7f..5ed592e0dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-29 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+ * lily/tempo-performer.cc (process_music): idem.
+
+ * lily/midi-def.cc (get_tempo): Rational to int conversion bug.
+
2005-08-27 Han-Wen Nienhuys <hanwen@xs4all.nl>
* Documentation/user/advanced-notation.itely (Text markup): not a
@@ -54,7 +60,7 @@
* scm/define-markup-commands.scm (wordwrap-string): use
text-direction
(wordwrap-stencils): idem.
- (line): idem..
+ (line): idem.
(fill-line): idem.
(wordwrap-stencils): translate last line to right for
text-direction = LEFT.
diff --git a/lily/midi-def.cc b/lily/midi-def.cc
index e7c3539f16..0905c4c2f7 100644
--- a/lily/midi-def.cc
+++ b/lily/midi-def.cc
@@ -30,8 +30,8 @@ get_tempo (Output_def *def,
else
wholes_per_min /= *w;
- int beats_per_min = int ((wholes_per_min / one_beat_mom).main_part_);
- return int (beats_per_min);
+ Rational beats_per_min = (wholes_per_min / one_beat_mom).main_part_;
+ return beats_per_min.to_int ();
}
void
diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc
index 55cc6f877d..8919805e3a 100644
--- a/lily/tempo-performer.cc
+++ b/lily/tempo-performer.cc
@@ -49,7 +49,7 @@ Tempo_performer::process_music ()
Rational r = (d->get_length () / Moment (Rational (1, 4)) * Moment (scm_to_int (met))).main_part_;
- audio_ = new Audio_tempo (int (r));
+ audio_ = new Audio_tempo (r.to_int ());
Audio_element_info info (audio_, tempo_event_);
announce_element (info);
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index e20ee9fdb0..dd9f7e1db9 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -908,7 +908,8 @@
. (
(self-alignment-X . 0)
(break-visibility . ,begin-of-line-visible)
- (X-offset-callbacks . (,Self_alignment_interface::centered_on_parent ,Self_alignment_interface::aligned_on_self))
+ (X-offset-callbacks . (,Self_alignment_interface::centered_on_parent
+ ,Self_alignment_interface::aligned_on_self))
(Y-offset-callbacks . (,Side_position_interface::aligned_side))
(print-function . ,Text_interface::print)
--
2.39.5