(process): return #f iso. #<undefined>. This

prevents #<undefined> leaking into GUILE-userspace.

diff --git a/ChangeLog b/ChangeLog
index 571e9e936e2277cc3d33305be87eb340152e1a35..68f8a806dd4a5eff76d8b81089063cde2cb0d88d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-18  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/performance.cc (process): return #f iso. #<undefined>. This
+       prevents #<undefined> leaking into GUILE-userspace.
+
 2005-04-17  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * 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  <janneke@gnu.org>
 

diff --git a/lily/global-context-scheme.cc b/lily/global-context-scheme.cc
index 6f83fc2fc4fa86457ad6446031416256fa07ad91..4f717561533cbc1fd28a84aa20a2b1bc20ab7194 100644 (file)
--- a/lily/global-context-scheme.cc
+++ b/lily/global-context-scheme.cc
@@ -27,6 +27,7 @@ LY_DEFINE (ly_format_output, "ly:format-output",
 
   Music_output *output = g->get_output ();
   progress_indication ("\n");
+
   /* ugh, midi still wants outname  */
   return output->process (ly_scm2string (outname));
 }

diff --git a/lily/include/music-output.hh b/lily/include/music-output.hh
index 05915e794baad41a1e6edbd98f2a17b1929d7cfe..cb75cc706114a018f84075613ceaa27245ad648b 100644 (file)
--- a/lily/include/music-output.hh
+++ b/lily/include/music-output.hh
@@ -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 */

diff --git a/lily/include/performance.hh b/lily/include/performance.hh
index 596e8777751ed9dfc6883c0f355995a3e6b3f63e..1d46cd8f66fe128837419d1457b5ddb5da761c9d 100644 (file)
--- a/lily/include/performance.hh
+++ b/lily/include/performance.hh
@@ -27,7 +27,7 @@ public:
   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_;
 };
 

diff --git a/lily/music-output.cc b/lily/music-output.cc
new file mode 100644 (file)
index 0000000..67b9530
--- /dev/null
+++ b/lily/music-output.cc
@@ -0,0 +1,25 @@
+/* 
+  music-output.cc --  implement Music_output
+  
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  
+*/
+
+#include "music-output.hh" 
+
+/*
+  Just stubs.
+ */
+SCM
+Music_output::process ()
+{
+  return SCM_EOL;
+}
+
+Music_output::~Music_output ()
+{
+  
+}
+  

diff --git a/lily/performance.cc b/lily/performance.cc
index 83a9b910480ab8616d7520943fa6d528176531c8..f030631acc5643d518982bcde220f5389123a895 100644 (file)
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -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 @@ Performance::add_element (Audio_element *p)
     {
       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 @@ Performance::process (String out)
 
   output (midi_stream);
   progress_indication ("\n");
-  return SCM_UNDEFINED;
+  return SCM_BOOL_F;
 }