X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator-group-ctors.cc;h=80d3e481c09440a690525250dd35a80364db80c4;hb=3aadd90d55f7c838071411ca839307e4500e6ad6;hp=4932048f9af89a7496ddc95d438c3d5ac462b74c;hpb=2c22efe5a46a37065b10c3f51c5d7db00d07d318;p=lilypond.git diff --git a/lily/translator-group-ctors.cc b/lily/translator-group-ctors.cc index 4932048f9a..80d3e481c0 100644 --- a/lily/translator-group-ctors.cc +++ b/lily/translator-group-ctors.cc @@ -1,16 +1,26 @@ /* - translator-group-ctors.cc -- implement Translator_group factory. + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2005--2010 Han-Wen Nienhuys - (c) 2005 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 "score-engraver.hh" #include "score-performer.hh" -#include "engraver-group-engraver.hh" -#include "performer-group-performer.hh" -#include "recording-group-engraver.hh" +#include "warn.hh" +#include "international.hh" /* Quick & dirty. @@ -18,17 +28,22 @@ Translator_group * get_translator_group (SCM sym) { - if (sym == ly_symbol2scm ("Engraver_group_engraver")) - return new Engraver_group_engraver (); - else if (sym == ly_symbol2scm ("Performer_group_performer")) - return new Performer_group_performer (); + if (sym == ly_symbol2scm ("Engraver_group")) + return new Engraver_group (); + else if (sym == ly_symbol2scm ("Performer_group")) + return new Performer_group (); else if (sym == ly_symbol2scm ("Score_engraver")) return new Score_engraver (); else if (sym == ly_symbol2scm ("Score_performer")) return new Score_performer (); - else if (sym == ly_symbol2scm ("Recording_group_engraver")) - return new Recording_group_engraver (); - assert (0); + error (_f ("fatal error. Couldn't find type: %s", + ly_symbol2string (sym).c_str ())); + scm_flush (scm_current_error_port ()); + scm_display (sym, scm_current_error_port ()); + scm_flush (scm_current_error_port ()); + + exit (2); + return 0; }