remove file.

diff --git a/ChangeLog b/ChangeLog
index 93667f87a12e8e967570eb1f25937b25e9675568..c1448ec2060e348ffb877f2da765f6ab3e97dd5e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 2005-01-14  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * 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.
 
        * scripts/convert-ly.py (conv): add  # to \property scalar value.
 

diff --git a/lily/include/time-scaled-music.hh b/lily/include/time-scaled-music.hh
deleted file mode 100644 (file)
index 18eda76..0000000
--- a/lily/include/time-scaled-music.hh
+++ /dev/null
@@ -1,25 +0,0 @@
-/*   
-  time-scaled-music.hh -- declare Time_scaled_music
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-#ifndef TIME_SCALED_MUSIC_HH
-#define TIME_SCALED_MUSIC_HH
-
-#include "music-wrapper.hh"
-/**
-   Tempo expansion or compression.
- */
-class Time_scaled_music : public Music_wrapper
-{
-public:
-  Time_scaled_music (SCM);
-  VIRTUAL_COPY_CONSTRUCTOR (Music, Time_scaled_music);
-};
-
-#endif /* TIME_SCALED_MUSIC_HH */
-

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index 939b90db94868a3787bded5602bae54a7345a2e6..a8dbf95bff293f9472c17d68e6956c8f86bc7048 100644 (file)
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -12,6 +12,8 @@
 Music_wrapper::Music_wrapper (SCM x)
   : Music (x)
 {
+  if (!ly_c_procedure_p (length_callback_))
+    length_callback_ = length_callback_proc; 
 }
 
 

diff --git a/lily/time-scaled-music-iterator.cc b/lily/time-scaled-music-iterator.cc
index 1111b68742b717bed279291ec7eb01eb50b9cdb1..f422ddd8c62d6452622bc6d28aafabd8b0a85e9e 100644 (file)
--- a/lily/time-scaled-music-iterator.cc
+++ b/lily/time-scaled-music-iterator.cc
@@ -8,10 +8,8 @@
  */
 
 #include "time-scaled-music-iterator.hh"
-
-#include "time-scaled-music.hh"
-#include "event.hh"
 #include "context.hh"
+#include "input.hh"
 
 void
 Time_scaled_music_iterator::process (Moment m)

diff --git a/lily/time-scaled-music.cc b/lily/time-scaled-music.cc
deleted file mode 100644 (file)
index bfe33e0..0000000
--- a/lily/time-scaled-music.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-/*   
-  time-scaled-music.cc --  implement Time_scaled_music
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-#include "time-scaled-music.hh"
-
-#include "time-scaled-music-iterator.hh"
-
-Time_scaled_music::Time_scaled_music (SCM x)
-  : Music_wrapper (x)
-{
-}
-
-ADD_MUSIC (Time_scaled_music);

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 0ee5f17fe1215fcc1b1aeb6e3bdfa54c09268c31..9d8e6acd3ffad646e01f47cfb7ac2dab15e9a61f 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -9,7 +9,6 @@
 
 #include "tuplet-bracket.hh"
 #include "note-column.hh"
-#include "time-scaled-music.hh"
 #include "beam.hh"
 #include "music-list.hh"
 #include "engraver.hh"