CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/08/27 20:05:58
Modified files:
. : ChangeLog
Documentation/topdocs: NEWS.tely
flower : rational.cc
input/regression: multi-measure-rest-text.ly
lily : midi-item.cc staff-performer.cc
scm : define-grobs.scm
Log message:
* lily/midi-item.cc (to_string): use to_int() iso. int cast.
* lily/staff-performer.cc (initialize): add tempo/name to
audio_staff_
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4091&tr2=1.4092&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/topdocs/NEWS.tely.diff?tr1=1.82&tr2=1.83&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/rational.cc.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/multi-measure-rest-text.ly.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/midi-item.cc.diff?tr1=1.86&tr2=1.87&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/staff-performer.cc.diff?tr1=1.75&tr2=1.76&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grobs.scm.diff?tr1=1.233&tr2=1.234&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4091 lilypond/ChangeLog:1.4092
--- lilypond/ChangeLog:1.4091 Fri Aug 26 19:24:34 2005
+++ lilypond/ChangeLog Sat Aug 27 20:05:57 2005
@@ -1,3 +1,11 @@
+2005-08-27 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * lily/midi-item.cc (to_string): use to_int() iso. int cast.
+
+ * lily/staff-performer.cc (initialize): add tempo/name to
+ audio_staff_
+
+
2005-08-26 Graham Percival <[EMAIL PROTECTED]>
* Documentation/user/advanced.itely: add text-only example.
Index: lilypond/Documentation/topdocs/NEWS.tely
diff -u lilypond/Documentation/topdocs/NEWS.tely:1.82
lilypond/Documentation/topdocs/NEWS.tely:1.83
--- lilypond/Documentation/topdocs/NEWS.tely:1.82 Fri Aug 26 08:42:43 2005
+++ lilypond/Documentation/topdocs/NEWS.tely Sat Aug 27 20:05:58 2005
@@ -53,7 +53,7 @@
@lilypond[relative=2,fragment,raggedright]
\override MultiMeasureRestText #'spacing-procedure
- = #Multi_measure_rest::set_spacing_rods
+ = #Multi_measure_rest::set_text_rods
c1 R1 R1^"Very long long long text"
@end lilypond
Index: lilypond/flower/rational.cc
diff -u lilypond/flower/rational.cc:1.35 lilypond/flower/rational.cc:1.36
--- lilypond/flower/rational.cc:1.35 Fri Aug 12 00:04:47 2005
+++ lilypond/flower/rational.cc Sat Aug 27 20:05:58 2005
@@ -286,7 +286,7 @@
int
Rational::to_int () const
{
- return num () / den ();
+ return (int) num () / den ();
}
int
Index: lilypond/input/regression/multi-measure-rest-text.ly
diff -u lilypond/input/regression/multi-measure-rest-text.ly:1.29
lilypond/input/regression/multi-measure-rest-text.ly:1.30
--- lilypond/input/regression/multi-measure-rest-text.ly:1.29 Fri Aug 26
08:42:43 2005
+++ lilypond/input/regression/multi-measure-rest-text.ly Sat Aug 27
20:05:58 2005
@@ -23,7 +23,7 @@
R2.*3_\markup { \roman "a1b2c3" }
R2.*10^"inner"^"top"_"inner"_"bot"
\override MultiMeasureRestText #'spacing-procedure
- = #Multi_measure_rest::set_spacing_rods
+ = #Multi_measure_rest::set_text_rods
R2.^"very very very very very very long text"
c'2.
Index: lilypond/lily/midi-item.cc
diff -u lilypond/lily/midi-item.cc:1.86 lilypond/lily/midi-item.cc:1.87
--- lilypond/lily/midi-item.cc:1.86 Sat Aug 20 23:56:02 2005
+++ lilypond/lily/midi-item.cc Sat Aug 27 20:05:58 2005
@@ -72,9 +72,11 @@
String length_string = String_convert::int2hex (dat.length ()
+ footer_string_.length (),
8, '0');
length_string = String_convert::hex2bin (length_string);
+
str += length_string;
str += dat;
str += footer_string_;
+
return str;
}
@@ -103,7 +105,7 @@
{
Rational rat_dt = (delta_mom_.main_part_ * Rational (384)
+ delta_mom_.grace_part_ * Rational (100)) * Rational (4);
- int delta_i = int (rat_dt);
+ int delta_i = rat_dt.to_int ();
String delta_string = Midi_item::i2varint_string (delta_i);
String midi_string = midi_->to_string ();
Index: lilypond/lily/staff-performer.cc
diff -u lilypond/lily/staff-performer.cc:1.75
lilypond/lily/staff-performer.cc:1.76
--- lilypond/lily/staff-performer.cc:1.75 Sat Aug 20 23:37:45 2005
+++ lilypond/lily/staff-performer.cc Sat Aug 27 20:05:58 2005
@@ -63,12 +63,14 @@
Staff_performer::initialize ()
{
audio_staff_ = new Audio_staff;
- announce_element (Audio_element_info (audio_staff_, 0));
-
name_ = new Audio_text (Audio_text::TRACK_NAME, context ()->id_string ());
- announce_element (Audio_element_info (name_, 0));
-
tempo_ = new Audio_tempo (get_tempo ());
+
+ audio_staff_->add_audio_item (name_);
+ audio_staff_->add_audio_item (tempo_);
+
+ announce_element (Audio_element_info (audio_staff_, 0));
+ announce_element (Audio_element_info (name_, 0));
announce_element (Audio_element_info (tempo_, 0));
}
Index: lilypond/scm/define-grobs.scm
diff -u lilypond/scm/define-grobs.scm:1.233 lilypond/scm/define-grobs.scm:1.234
--- lilypond/scm/define-grobs.scm:1.233 Fri Aug 26 08:42:43 2005
+++ lilypond/scm/define-grobs.scm Sat Aug 27 20:05:58 2005
@@ -818,6 +818,7 @@
(MultiMeasureRestNumber
. (
(print-function . ,Text_interface::print)
+ (spacing-procedure . ,Multi_measure_rest::set_spacing_rods)
(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
,Self_alignment_interface::centered_on_other_axis_parent))
(Y-offset-callbacks . (,Side_position_interface::aligned_side))
@@ -836,7 +837,6 @@
(MultiMeasureRestText
. (
(print-function . ,Text_interface::print)
- (spacing-procedure . ,Multi_measure_rest::set_text_rods)
(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
,Self_alignment_interface::centered_on_other_axis_parent))
(Y-offset-callbacks . (,Side_position_interface::aligned_side))
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
