* lily/include/music.hh (class Music): replace Music::start_mom()

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

diff --git a/lily/simultaneous-music.cc b/lily/simultaneous-music.cc
index ba79169dbd6e2f67d79ca41c3c8bc6deba0d852c..7d82cc7660bec49fe95d94c37af9938d7fc4305f 100644 (file)
--- a/lily/simultaneous-music.cc
+++ b/lily/simultaneous-music.cc
@@ -8,24 +8,12 @@
 */
 
 #include "input.hh"
-#include "moment.hh"
 #include "pitch.hh"
 #include "music-list.hh"
 #include "scm-option.hh"
 
-Moment
-Simultaneous_music::get_length () const
-{
-  return Music_sequence::maximum_length (get_property ("elements"));
-}
-
-Moment
-Simultaneous_music::start_mom () const
-{
-  return Music_sequence::minimum_start (get_property ("elements"));
-}
-
-Simultaneous_music::Simultaneous_music ()
+Simultaneous_music::Simultaneous_music (SCM x)
+  : Music_sequence (x)
 {
 
 }
@@ -33,10 +21,17 @@ Simultaneous_music::Simultaneous_music ()
 Pitch
 Simultaneous_music::to_relative_octave (Pitch p)
 {
+  Pitch retval = music_list_to_relative (music_list (), p, false);
   if (lily_1_8_relative)
-    lily_1_8_compatibility_used = true;
-  
-  return music_list_to_relative (music_list (), p, lily_1_8_relative);
+    {
+      Pitch retval_1_8 = music_list_to_relative (music_list (), p, true);
+      if (retval_1_8 != retval)
+       lily_1_8_compatibility_used = true;
+
+      retval = retval_1_8;
+    }
+
+  return retval;
 }
 
 ADD_MUSIC (Simultaneous_music);
@@ -47,4 +42,9 @@ Event_chord::to_relative_octave (Pitch p)
   return music_list_to_relative (music_list (), p, true);
 }
 
+Event_chord::Event_chord (SCM x)
+  : Simultaneous_music (x)
+{
+}
+
 ADD_MUSIC (Event_chord);