X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsimultaneous-music-iterator.cc;h=7f7dd0e38c9a6ea20e85112ed691f3b35141fc66;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=e2e3c1977b11848e80eda37d7c2f8a29c6d0c5ee;hpb=163225c0cbb1055dfd3614615350ab9f3aaba74c;p=lilypond.git diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc index e2e3c1977b..7f7dd0e38c 100644 --- a/lily/simultaneous-music-iterator.cc +++ b/lily/simultaneous-music-iterator.cc @@ -1,16 +1,26 @@ /* - Simultaneous_music-iterator.cc -- implement Simultaneous_music_iterator + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2014 Han-Wen Nienhuys - (c) 1997--2004 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "simultaneous-music-iterator.hh" - +#include "music.hh" #include "context.hh" #include "warn.hh" -#include "music-list.hh" #include "context-def.hh" Simultaneous_music_iterator::Simultaneous_music_iterator () @@ -19,7 +29,6 @@ Simultaneous_music_iterator::Simultaneous_music_iterator () children_list_ = SCM_EOL; } - void Simultaneous_music_iterator::derived_mark () const { @@ -27,10 +36,10 @@ Simultaneous_music_iterator::derived_mark () const } void -Simultaneous_music_iterator::derived_substitute (Context *f,Context *t) +Simultaneous_music_iterator::derived_substitute (Context *f, Context *t) { for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s)) - unsmob_iterator (scm_car (s))-> substitute_outlet (f,t); + Music_iterator::unsmob (scm_car (s))->substitute_outlet (f, t); } void @@ -41,59 +50,55 @@ Simultaneous_music_iterator::construct_children () SCM i = get_music ()->get_property ("elements"); children_list_ = SCM_EOL; - SCM * tail = &children_list_; + SCM *tail = &children_list_; for (; scm_is_pair (i); i = scm_cdr (i), j++) { Music *mus = unsmob_music (scm_car (i)); SCM scm_iter = get_static_get_iterator (mus); - Music_iterator * mi = unsmob_iterator (scm_iter); + Music_iterator *mi = Music_iterator::unsmob (scm_iter); /* if create_separate_contexts_ is set, create a new context with the - number number as name */ + number number as name */ - SCM name = ly_symbol2scm (get_outlet ()->context_name ().to_str0 ()); - Context * t = (j && create_separate_contexts_) - ? get_outlet ()->find_create_context (name, to_string (j), SCM_EOL) - : get_outlet (); + SCM name = ly_symbol2scm (get_outlet ()->context_name ().c_str ()); + Context *c = (j && create_separate_contexts_) + ? get_outlet ()->find_create_context (name, ::to_string (j), SCM_EOL) + : get_outlet (); - if (!t) - t = get_outlet (); + if (!c) + c = get_outlet (); - mi->init_translator (mus, t); + mi->init_context (mus, c); mi->construct_children (); - if (mi->ok ()) - { - *tail = scm_cons (scm_iter, *tail); - tail = SCM_CDRLOC (*tail); - } + if (mi->ok ()) + { + *tail = scm_cons (scm_iter, *tail); + tail = SCM_CDRLOC (*tail); + } else - mi->set_context (0); + mi->quit (); } } void Simultaneous_music_iterator::process (Moment until) { - SCM *proc = &children_list_; + SCM *proc = &children_list_; while (scm_is_pair (*proc)) { - Music_iterator * i = unsmob_iterator (scm_car (*proc)); + Music_iterator *i = Music_iterator::unsmob (scm_car (*proc)); if (i->run_always () - || i->pending_moment () == until) - { - i->process (until); - } + || i->pending_moment () == until) + i->process (until); if (!i->ok ()) - { - i->quit (); - *proc = scm_cdr (*proc); - } + { + i->quit (); + *proc = scm_cdr (*proc); + } else - { - proc = SCM_CDRLOC (*proc); - } + proc = SCM_CDRLOC (*proc); } } @@ -102,27 +107,27 @@ Simultaneous_music_iterator::pending_moment () const { Moment next; next.set_infinite (1); - + for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s)) { - Music_iterator * it = unsmob_iterator (scm_car (s)); - next = next pending_moment (); + Music_iterator *it = Music_iterator::unsmob (scm_car (s)); + next = min (next, it->pending_moment ()); } - + return next; } bool Simultaneous_music_iterator::ok () const { - bool run_always_ok = false; + bool run_always_ok = false; for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s)) { - Music_iterator * it = unsmob_iterator (scm_car (s)); + Music_iterator *it = Music_iterator::unsmob (scm_car (s)); if (!it->run_always ()) - return true; + return true; else - run_always_ok = run_always_ok || it->ok (); + run_always_ok = run_always_ok || it->ok (); } return run_always_ok; } @@ -132,27 +137,18 @@ Simultaneous_music_iterator::run_always () const { for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s)) { - Music_iterator * it = unsmob_iterator (scm_car (s)); + Music_iterator *it = Music_iterator::unsmob (scm_car (s)); if (it->run_always ()) - return true; + return true; } return false; } -Music_iterator* -Simultaneous_music_iterator::try_music_in_children (Music *m) const -{ - Music_iterator * b= 0; - for (SCM s = children_list_; !b && scm_is_pair (s); s = scm_cdr (s)) - b =unsmob_iterator (scm_car (s))->try_music (m); - return b; -} - void Simultaneous_music_iterator::do_quit () { for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s)) - unsmob_iterator (scm_car (s))->quit (); + Music_iterator::unsmob (scm_car (s))->quit (); } IMPLEMENT_CTOR_CALLBACK (Simultaneous_music_iterator);