X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsimple-music-iterator.cc;h=8345d60d6f123e8cb0c1f0c51d3856a6cdf57a50;hb=8659a99f233f5c4684292728e7ad4206669b35b0;hp=2b8519fbf9b49d60ad8f3a8fb76e48a416a512b7;hpb=487ee28c2a58e7bd5cb9e85c7676057c0b32f385;p=lilypond.git diff --git a/lily/simple-music-iterator.cc b/lily/simple-music-iterator.cc index 2b8519fbf9..8345d60d6f 100644 --- a/lily/simple-music-iterator.cc +++ b/lily/simple-music-iterator.cc @@ -1,13 +1,24 @@ -/* - simple-music-iterator.cc -- implement Simple_music_iterator - - source file of the GNU LilyPond music typesetter - - (c) 2000--2002 Han-Wen Nienhuys - - */ +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 2000--2015 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 "simple-music-iterator.hh" + #include "music.hh" #include "input.hh" @@ -17,12 +28,6 @@ Simple_music_iterator::Simple_music_iterator () last_processed_mom_ = -1; } -Simple_music_iterator::Simple_music_iterator (Simple_music_iterator const &src) - : Music_iterator (src) -{ - last_processed_mom_ = src.last_processed_mom_; -} - bool Simple_music_iterator::ok ()const { @@ -35,7 +40,6 @@ Simple_music_iterator::ok ()const Engravers can detect and event the end-moments to be processed as well. - */ Moment Simple_music_iterator::pending_moment ()const @@ -46,28 +50,15 @@ Simple_music_iterator::pending_moment ()const return music_get_length (); } -void -Simple_music_iterator::skip (Moment m) -{ - /* - docme??!! - - uncommented because setting MUSIC_L_ = 0 causes core dumps with - grace notes. */ - - // music_ = 0; - - last_processed_mom_ = m; -} - void Simple_music_iterator::process (Moment m) { /* - don't do try_music (), since it would make the function useless for - base classes */ + don't do report_event (), since it would make the function useless for + base classes + */ - skip (m); + last_processed_mom_ = m; } IMPLEMENT_CTOR_CALLBACK (Simple_music_iterator);