Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / translator-group-ctors.cc

diff --git a/lily/translator-group-ctors.cc b/lily/translator-group-ctors.cc
index ead329095bb9c914515377efb686cb954818f1cd..83feef1634468e1b33cd052d88e53fd532418606 100644 (file)
--- a/lily/translator-group-ctors.cc
+++ b/lily/translator-group-ctors.cc
@@ -3,34 +3,33 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #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"
 
 /*
   Quick & dirty.
- */
+*/
 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();
+    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();
+    return new Score_performer ();
 
+  programming_error ("Couldn't find type");
+  scm_flush (scm_current_error_port ());
+  scm_display (sym, scm_current_error_port ());
+  scm_flush (scm_current_error_port ());
+  
   assert (0);
   return 0;
 }