release: 0.0.74pre

[lilypond.git] / lily / identifier.cc

diff --git a/lily/identifier.cc b/lily/identifier.cc
index 0a2c813f2f5879ae7a7c2db598399498d37d7387..40c7e543e86c8dde801ac94034fe5112a099319c 100644 (file)
--- a/lily/identifier.cc
+++ b/lily/identifier.cc
@@ -7,18 +7,17 @@
 */
 
 #include <assert.h>
-#include "midi-def.hh"
 #include "paper-def.hh"
 #include "score.hh"
 #include "identifier.hh"
 #include "my-lily-lexer.hh"
 #include "debug.hh"
+
 #include "symtable.hh"
 #include "lookup.hh"
 #include "script-def.hh"
 #include "request.hh"
-#include "input-engraver.hh"
-#include "input-performer.hh"
+#include "input-translator.hh"
 
 IMPLEMENT_STATIC_NAME(Identifier);
 IMPLEMENT_IS_TYPE_B(Identifier);
@@ -67,9 +66,7 @@ DEFAULT_PRINT(Symtables_id, Symtables, symtables);
 DEFAULT_PRINT(Music_id,Music , music);
 DEFAULT_PRINT(Request_id, Request, request);
 DEFAULT_PRINT(Score_id, Score, score);
-DEFAULT_PRINT(Input_gravs_id, Input_engraver, igravs);
-DEFAULT_PRINT(Input_perfs_id, Input_performer, iperfs);
-DEFAULT_PRINT(Midi_def_id,Midi_def, mididef);
+DEFAULT_PRINT(Input_trans_id, Input_translator, itrans);
 DEFAULT_PRINT(Paper_def_id,Paper_def, paperdef);
 
 void
@@ -122,9 +119,7 @@ implement_id_class(Symtables_id, Symtables, symtables);
 implement_id_class(Music_id, Music, music);
 implement_id_class(Score_id, Score, score);
 implement_id_class(Request_id, Request, request);
-implement_id_class(Input_gravs_id, Input_engraver, igravs);
-implement_id_class(Input_perfs_id, Input_performer, iperfs);
-implement_id_class(Midi_def_id, Midi_def, mididef);
+implement_id_class(Input_trans_id, Input_translator, itrans);
 implement_id_class(Paper_def_id, Paper_def, paperdef);
 
 Identifier::Identifier(Identifier const&)
@@ -140,7 +135,5 @@ default_accessor(Symtables_id, Symtables, symtables);
 virtual_accessor(Music_id, Music, music);
 default_accessor(Score_id, Score, score);
 virtual_accessor(Request_id, Request, request);
-default_accessor(Input_gravs_id, Input_engraver, igravs);
-default_accessor(Input_perfs_id, Input_performer, iperfs);
-default_accessor(Midi_def_id, Midi_def, mididef);
+default_accessor(Input_trans_id, Input_translator, itrans);
 default_accessor(Paper_def_id, Paper_def, paperdef);