X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-combine-music.cc;h=1d0b911515affdfea683c97b6cb50096b281029c;hb=ed463da03e0dd394c86ccd89fdea435b53b622b7;hp=8edc61903f04e345a4ae48eaf178e98b695cc8a3;hpb=051d7e7cbdbbe5f5337ab2b477b0bd1e72eedd04;p=lilypond.git diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc index 8edc61903f..1d0b911515 100644 --- a/lily/lyric-combine-music.cc +++ b/lily/lyric-combine-music.cc @@ -3,12 +3,11 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2002 Han-Wen Nienhuys + (c) 1999--2003 Han-Wen Nienhuys */ #include "lyric-combine-music.hh" -#include "lyric-combine-music-iterator.hh" #include "pitch.hh" Lyric_combine_music::Lyric_combine_music () @@ -16,36 +15,12 @@ Lyric_combine_music::Lyric_combine_music () { } - -void -Lyric_combine_music::transpose (Pitch p) -{ - get_music ()->transpose (p); - get_lyrics () ->transpose (p); -} - - Moment Lyric_combine_music::get_length () const { return get_music ()->get_length (); } -Pitch -Lyric_combine_music::to_relative_octave (Pitch p) -{ - p = get_music ()->to_relative_octave (p); - return get_lyrics () ->to_relative_octave (p); -} - -void -Lyric_combine_music::compress (Moment m) -{ - get_music ()->compress (m); -} - - - Music* Lyric_combine_music::get_music () const {