catch GUILE errors

[lilypond.git] / lily / include / part-combine-music.hh

diff --git a/lily/include/part-combine-music.hh b/lily/include/part-combine-music.hh
index cccfaaa1d3700f312b7d0f260df598c34f1805ee..289684e86e54f3d2065ae3d7b5a58dce1abb6473 100644 (file)
--- a/lily/include/part-combine-music.hh
+++ b/lily/include/part-combine-music.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
@@ -17,16 +17,18 @@ class Part_combine_music : public Music
 {
 public:
   VIRTUAL_COPY_CONS (Music);
-  Part_combine_music (SCM what_str, Music*, Music*);
+  Part_combine_music (SCM l);
 
-  Music * first_l () const;
-  Music * second_l () const;
+  Music * get_first () const;
+  Music * get_second () const;
   
-  virtual void transpose (Musical_pitch);
+  virtual void transpose (Pitch);
 
   virtual Moment length_mom () const;
-  virtual Musical_pitch to_relative_octave (Musical_pitch);
+  virtual Pitch to_relative_octave (Pitch);
   virtual void compress (Moment);
+
+  Part_combine_music ();
 };
 
 #endif /* PART_COMBINE_MUSIC_HH */