From eeb0e852589b3e90623ee589e0b6dfd2535d0688 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 14 Jan 2005 14:13:42 +0000
Subject: [PATCH] * 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.
---
lily/event.cc | 3 ---
lily/include/event.hh | 1 -
lily/include/music.hh | 2 +-
lily/music.cc | 3 +++
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/lily/event.cc b/lily/event.cc
index 271f1b6ed7..d25ec1a149 100644
--- 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 f282eb9418..7800913444 100644
--- 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 0eefbc3b71..b0ddf77f3f 100644
--- 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 edaed5e3f3..ea8e3d8d19 100644
--- 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
--
2.39.5