From: Han-Wen Nienhuys Date: Sat, 28 Sep 2002 21:12:57 +0000 (+0000) Subject: * lily/part-combine-music.cc: removed file and class. X-Git-Tag: release/1.7.2~25 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3f0eeade60254cf648e559d5b74a7f0e343c34e7;p=lilypond.git * lily/part-combine-music.cc: removed file and class. * lily/context-specced-music-iterator.cc (class Context_specced_music_iterator): new file. Obsoletes the Context_specced_music type. * scm/music-types.scm (make-repeated-music): put different kinds of repeated music into music-type table. --- diff --git a/ChangeLog b/ChangeLog index 6d555e3249..7ee5170aeb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2002-09-28 Han-Wen Nienhuys + * lily/part-combine-music.cc: removed file and class. + * lily/context-specced-music-iterator.cc (class Context_specced_music_iterator): new file. Obsoletes the Context_specced_music type. diff --git a/lily/include/part-combine-music.hh b/lily/include/part-combine-music.hh deleted file mode 100644 index 289684e86e..0000000000 --- a/lily/include/part-combine-music.hh +++ /dev/null @@ -1,35 +0,0 @@ -/* - part-combine-music.hh -- declare Part_combine_music - - source file of the GNU LilyPond music typesetter - - (c) 2000--2002 Jan Nieuwenhuizen - - */ - -#ifndef PART_COMBINE_MUSIC_HH -#define PART_COMBINE_MUSIC_HH - -#include "music.hh" - - -class Part_combine_music : public Music -{ -public: - VIRTUAL_COPY_CONS (Music); - Part_combine_music (SCM l); - - Music * get_first () const; - Music * get_second () const; - - virtual void transpose (Pitch); - - virtual Moment length_mom () const; - virtual Pitch to_relative_octave (Pitch); - virtual void compress (Moment); - - Part_combine_music (); -}; - -#endif /* PART_COMBINE_MUSIC_HH */ - diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index 51aba71a78..7d632c7f13 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -15,7 +15,6 @@ #include "music-wrapper.hh" #include "music-wrapper-iterator.hh" #include "simple-music-iterator.hh" - #include "ly-smobs.icc" Music_iterator::Music_iterator () diff --git a/lily/parser.yy b/lily/parser.yy index 68dae70124..fcb719e317 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -40,7 +40,6 @@ this. #include "request.hh" #include "my-lily-parser.hh" -#include "context-specced-music.hh" #include "score.hh" #include "music-list.hh" #include "output-property-music-iterator.hh" @@ -55,7 +54,6 @@ this. #include "untransposable-music.hh" #include "lilypond-input-version.hh" #include "grace-music.hh" -#include "part-combine-music.hh" #include "scm-hash.hh" #include "auto-change-iterator.hh" #include "un-relativable-music.hh" diff --git a/lily/part-combine-music-iterator.cc b/lily/part-combine-music-iterator.cc index 31959d48d5..4a997c0968 100644 --- a/lily/part-combine-music-iterator.cc +++ b/lily/part-combine-music-iterator.cc @@ -6,7 +6,6 @@ (c) 2000--2002 Jan Nieuwenhuizen */ -#include "part-combine-music.hh" #include "part-combine-music-iterator.hh" #include "translator-group.hh" #include "request.hh" @@ -83,13 +82,15 @@ Part_combine_music_iterator::ok () const return first_iter_->ok () || second_iter_->ok (); } + void Part_combine_music_iterator::construct_children () { - Part_combine_music const * m = dynamic_cast (get_music ()); + SCM lst = get_music ()->get_mus_property ("elements"); + - first_iter_ = unsmob_iterator (get_iterator (m->get_first ())); - second_iter_ = unsmob_iterator (get_iterator (m->get_second ())); + first_iter_ = unsmob_iterator (get_iterator (unsmob_music (gh_car (lst)))); + second_iter_ = unsmob_iterator (get_iterator (unsmob_music (gh_cadr (lst)))); } void @@ -171,7 +172,8 @@ int Part_combine_music_iterator::get_state (Moment) { int state = UNKNOWN; - Part_combine_music const *p = dynamic_cast (get_music ()); + + Music *p = get_music (); String w = ly_scm2string (p->get_mus_property ("what")); @@ -371,8 +373,7 @@ s Consider thread switching: threads "one", "two" and "both". else state = state_; - Part_combine_music const *p = - dynamic_cast (get_music ()); + Music *p =get_music (); bool previously_combined_b = first_iter_->report_to ()->daddy_trans_ diff --git a/lily/part-combine-music.cc b/lily/part-combine-music.cc deleted file mode 100644 index 8ad0fd6e98..0000000000 --- a/lily/part-combine-music.cc +++ /dev/null @@ -1,67 +0,0 @@ -/* - part-combine-music.cc -- implement Part_combine_music - - source file of the GNU LilyPond music typesetter - - (c) 2000--2002 Jan Nieuwenhuizen - - */ - -#include "part-combine-music.hh" -#include "part-combine-music-iterator.hh" -#include "pitch.hh" - -Part_combine_music::Part_combine_music () -{ -} - -void -Part_combine_music::transpose (Pitch p) -{ - get_first ()->transpose (p); - get_second () ->transpose (p); -} - -Moment -Part_combine_music::length_mom () const -{ - return get_first ()->length_mom (); -} - -Pitch -Part_combine_music::to_relative_octave (Pitch p) -{ - p = get_first ()->to_relative_octave (p); - return get_second ()->to_relative_octave (p); -} - -void -Part_combine_music::compress (Moment m) -{ - get_first ()->compress (m); - get_second ()->compress (m); -} - -Music* -Part_combine_music::get_first () const -{ - SCM l = get_mus_property ("elements"); - if (!gh_pair_p (l)) - return 0; - return unsmob_music (gh_car (l)); -} - - -Music* -Part_combine_music::get_second () const -{ - SCM l = get_mus_property ("elements"); - if (!gh_pair_p (l)) - return 0; - l = gh_cdr (l); - if (!gh_pair_p (l)) - return 0; - return unsmob_music (gh_car (l)); -} - -ADD_MUSIC (Part_combine_music); diff --git a/scm/music-types.scm b/scm/music-types.scm index ef08c59fd4..0c1d5fe578 100644 --- a/scm/music-types.scm +++ b/scm/music-types.scm @@ -212,7 +212,7 @@ . ( (description . "") - (internal-class-name . "Part_combine_music") + (internal-class-name . "Simultaneous_music") (types . (general-music part-combine-music)) (iterator-ctor . ,Part_combine_music_iterator::constructor) ))