From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 14 Jan 2005 12:36:39 +0000 (+0000)
Subject: remove file.
X-Git-Tag: release/2.5.14~262
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ea1b3696c02bb143fc7faf8b872a5c23c0725fef;p=lilypond.git

remove file.
---

diff --git a/ChangeLog b/ChangeLog
index 93667f87a1..c1448ec206 100644
--- 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
index 18eda762e7..0000000000
--- 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 939b90db94..a8dbf95bff 100644
--- 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 1111b68742..f422ddd8c6 100644
--- 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
index bfe33e045a..0000000000
--- 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 0ee5f17fe1..9d8e6acd3f 100644
--- 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"