2003 -> 2004

[lilypond.git] / lily / simultaneous-music.cc

diff --git a/lily/simultaneous-music.cc b/lily/simultaneous-music.cc
index 85a3b8136fd8de2222f4454b13bd9008004289d9..011734b9661e677ae13d12180b1782828dff6eab 100644 (file)
--- a/lily/simultaneous-music.cc
+++ b/lily/simultaneous-music.cc
@@ -1,11 +1,20 @@
+/*   
+  simultaneous-music.cc --  implement Simultaneous_music
 
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+*/
+
+#include "input.hh"
 #include "moment.hh"
 #include "pitch.hh"
-#include "simultaneous-music-iterator.hh"
 #include "music-list.hh"
+#include "scm-option.hh"
 
 Moment
-Simultaneous_music::length_mom () const
+Simultaneous_music::get_length () const
 {
   return Music_sequence::maximum_length (get_mus_property ("elements"));
 }
@@ -16,24 +25,26 @@ Simultaneous_music::start_mom () const
   return Music_sequence::minimum_start (get_mus_property ("elements"));
 }
 
-Simultaneous_music::Simultaneous_music (SCM head)
-  : Music_sequence (head)
+Simultaneous_music::Simultaneous_music()
 {
-  set_mus_property ("iterator-ctor",
-                   Simultaneous_music_iterator::constructor_cxx_function);
+
 }
 
-Simultaneous_music::Simultaneous_music ()
-  : Music_sequence ()
+Pitch
+Simultaneous_music::to_relative_octave (Pitch p)
 {
-  set_mus_property ("iterator-ctor",
-                   Simultaneous_music_iterator::constructor_cxx_function);
+  if (lily_1_8_relative)
+    lily_1_8_compatibility_used = true;
   
+  return music_list_to_relative (music_list(), p, lily_1_8_relative);
 }
 
+ADD_MUSIC (Simultaneous_music);
+
 Pitch
-Simultaneous_music::to_relative_octave (Pitch p)
+Event_chord::to_relative_octave (Pitch p)
 {
-  return do_relative_octave (p, true);
+  return music_list_to_relative (music_list (), p, true);
 }
-ADD_MUSIC (Simultaneous_music);
+
+ADD_MUSIC(Event_chord);