* lily/sequential-music.cc: remove file.

* lily/include/music.hh (class Music): replace Music::start_mom()
by start-callback property

* lily/time-scaled-music.cc: remove file.

* lily/include/music.hh (class Music): include SCM init argument.
(class Music): replace Music::get_length() virtual by
length-callback property everywhere.

diff --git a/lily/event.cc b/lily/event.cc
index 271f1b6ed794e83d9ebce194b1c288c755ebbcf1..d25ec1a149d3387c209af058efb3ae08dc62ca56 100644 (file)
--- a/lily/event.cc
+++ b/lily/event.cc
@@ -27,9 +27,6 @@ Event::length_callback (SCM m)
 void
 Event::compress (Moment m)
 {
-  Duration *d =  unsmob_duration (get_property ("duration"));
-  if (d)
-    set_property ("duration", d ->compressed (m.main_part_).smobbed_copy ());
 }
 
 

diff --git a/lily/include/event.hh b/lily/include/event.hh
index f282eb941896ee89583206417bbfdce5d8f29c68..780091344499cd82791a5eef5f669b96c0acf297 100644 (file)
--- a/lily/include/event.hh
+++ b/lily/include/event.hh
@@ -22,7 +22,6 @@ class Event : public Music
 public:
   Event (SCM);
   VIRTUAL_COPY_CONSTRUCTOR (Music, Event);
-  virtual void compress (Moment);
   DECLARE_SCHEME_CALLBACK(length_callback,(SCM));
   virtual Pitch to_relative_octave (Pitch);
 };

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 0eefbc3b71ec4adb977b410b3da2f41d63c29830..b0ddf77f3ff3fd4d803409c095a9cc140d8f1851 100644 (file)
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -53,7 +53,7 @@ public:
   virtual void transpose (Pitch p);
 
   /// Scale the music in time by #factor#.
-  virtual void compress (Moment factor);
+  void compress (Moment factor);
   
 protected:
   DECLARE_SMOBS (Music,);

diff --git a/lily/music.cc b/lily/music.cc
index edaed5e3f3abf1670fab5f6f90bccdc5fa924a21..ea8e3d8d19e5c732f5716545c6a64c01e36db7ca 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -171,6 +171,9 @@ Music::compress (Moment factor)
     m->compress (factor);
 
   compress_music_list (get_property ("elements"), factor);
+  Duration *d =  unsmob_duration (get_property ("duration"));
+  if (d)
+    set_property ("duration", d ->compressed (m.main_part_).smobbed_copy ());
 }
 
 void