Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

[lilypond.git] / lily / include / lily-proto.hh

diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh
index a76022b434095ecf6c54f5f0f351aa4e860887c0..6de69e16b92157352f6bd7955196ece89cd2cc93 100644 (file)
--- a/lily/include/lily-proto.hh
+++ b/lily/include/lily-proto.hh
@@ -22,10 +22,9 @@
 
 #include "flower-proto.hh"
 
-class Acknowledge_information;
 class All_font_metrics;
 class Audio_column;
-class Audio_control_function_value_change;
+class Audio_control_change;
 class Audio_dynamic;
 class Audio_element;
 class Audio_instrument;
@@ -59,7 +58,6 @@ class Dot_column;
 class Dot_configuration;
 class Dot_formatting_problem;
 class Engraver;
-class Engraver;
 class Engraver_group;
 class Event;
 class Event_chord;
@@ -86,14 +84,14 @@ class Ligature_engraver;
 class Lily_lexer;
 class Lily_parser;
 class Listener;
-class Lookup;
 class Lyric_combine_music;
 class Lyric_combine_music_iterator;
 class Lyric_engraver;
 class Lyric_performer;
 class Mensural_ligature_engraver;
 class Midi_chunk;
-class Midi_control_function_value_change;
+class Midi_control_change;
+class Midi_control_change_announcer;
 class Midi_duration;
 class Midi_dynamic;
 class Midi_event;
@@ -141,6 +139,8 @@ class Rhythmic_music_iterator;
 class Scale;
 class Scheme_hash_table;
 class Scheme_engraver;
+class Scm_module;
+class Scm_variable;
 class Score;
 class Score_engraver;
 class Score_performer;