CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/04/17 22:41:23
Modified files:
. : ChangeLog
lily : global-context-scheme.cc performance.cc
lily/include : music-output.hh performance.hh
Added files:
lily : music-output.cc
Log message:
(process): return #f iso. #<undefined>. This
prevents #<undefined> leaking into GUILE-userspace.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3450&tr2=1.3451&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/music-output.cc?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/global-context-scheme.cc.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/performance.cc.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/music-output.hh.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/performance.hh.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3450 lilypond/ChangeLog:1.3451
--- lilypond/ChangeLog:1.3450 Sun Apr 17 21:16:31 2005
+++ lilypond/ChangeLog Sun Apr 17 22:41:22 2005
@@ -1,3 +1,8 @@
+2005-04-18 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * lily/performance.cc (process): return #f iso. #<undefined>. This
+ prevents #<undefined> leaking into GUILE-userspace.
+
2005-04-17 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* config.hh.in: remove HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC
@@ -57,7 +62,7 @@
* framework-eps.scm: code added so that a macro \betweenLilyPondSystem
with one parameter can be defined in a LaTeX file when processed
by lilypond-book this will be evaluated between the systems of
- a muti-system score. The parameter is the number of systems processed.
+ a multi-system score. The parameter is the number of systems processed.
2005-04-16 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
Index: lilypond/lily/global-context-scheme.cc
diff -u lilypond/lily/global-context-scheme.cc:1.6
lilypond/lily/global-context-scheme.cc:1.7
--- lilypond/lily/global-context-scheme.cc:1.6 Tue Apr 12 22:49:28 2005
+++ lilypond/lily/global-context-scheme.cc Sun Apr 17 22:41:23 2005
@@ -27,6 +27,7 @@
Music_output *output = g->get_output ();
progress_indication ("\n");
+
/* ugh, midi still wants outname */
return output->process (ly_scm2string (outname));
}
Index: lilypond/lily/include/music-output.hh
diff -u lilypond/lily/include/music-output.hh:1.20
lilypond/lily/include/music-output.hh:1.21
--- lilypond/lily/include/music-output.hh:1.20 Mon Mar 28 22:26:30 2005
+++ lilypond/lily/include/music-output.hh Sun Apr 17 22:41:23 2005
@@ -16,11 +16,8 @@
class Music_output
{
public:
- virtual SCM process (String)
- {
- return SCM_EOL;
- }
- virtual ~Music_output () {}
+ virtual SCM process (String);
+ virtual ~Music_output ();
};
#endif /* MUSIC_OUTPUT_HH */
Index: lilypond/lily/include/performance.hh
diff -u lilypond/lily/include/performance.hh:1.20
lilypond/lily/include/performance.hh:1.21
--- lilypond/lily/include/performance.hh:1.20 Thu Mar 10 14:36:12 2005
+++ lilypond/lily/include/performance.hh Sun Apr 17 22:41:23 2005
@@ -27,7 +27,7 @@
SCM process (String);
Link_array<Audio_staff> audio_staffs_;
- Cons<Audio_element> *audio_elem_p_list_;
+ Cons<Audio_element> *audio_element_list_;
Output_def *midi_;
};
Index: lilypond/lily/performance.cc
diff -u lilypond/lily/performance.cc:1.54 lilypond/lily/performance.cc:1.55
--- lilypond/lily/performance.cc:1.54 Tue Apr 12 22:49:28 2005
+++ lilypond/lily/performance.cc Sun Apr 17 22:41:23 2005
@@ -26,12 +26,12 @@
Performance::Performance ()
{
midi_ = 0;
- audio_elem_p_list_ = 0;
+ audio_element_list_ = 0;
}
Performance::~Performance ()
{
- delete audio_elem_p_list_;
+ delete audio_element_list_;
}
void
@@ -146,7 +146,7 @@
{
audio_staffs_.push (s);
}
- audio_elem_p_list_ = new Killing_cons<Audio_element> (p, audio_elem_p_list_);
+ audio_element_list_ = new Killing_cons<Audio_element> (p,
audio_element_list_);
}
SCM
@@ -165,5 +165,5 @@
output (midi_stream);
progress_indication ("\n");
- return SCM_UNDEFINED;
+ return SCM_BOOL_F;
}
_______________________________________________
Lilypond-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
