release: 0.0.44

[lilypond.git] / mi2mu / include / my-midi-parser.hh

diff --git a/mi2mu/include/my-midi-parser.hh b/mi2mu/include/my-midi-parser.hh
index 66de991259599322ac81329c43b70b958e88740e..95367f3fa099c2d6b49cd9cfee2dc7aaf56e457a 100644 (file)
--- a/mi2mu/include/my-midi-parser.hh
+++ b/mi2mu/include/my-midi-parser.hh
@@ -6,55 +6,56 @@
 #ifndef MY_MIDI_PARSER_HH
 #define MY_MIDI_PARSER_HH
 
-// #include "proto.hh"
-// #include "string.hh"
 
 int yyparse();
 
-/// (midi_parser)
+/** 
+  An interface to the YACC midi parser.
+  (midi_parser)
+ */
 class My_midi_parser {
 public:
-       My_midi_parser( String filename_str );
-       ~My_midi_parser();
-
-       void add_score( Midi_score* midi_score_p );
-       void error( char const* sz_l );
-       int parse();
-       void forward( int i );
-       Moment mom();
-       void note_begin( int channel_i, int pitch_i, int dyn_i );
-       Midi_event* note_end_midi_event_p( int channel_i, int pitch_i, int dyn_i );
-       int output_mudela( String filename_str );
-       void reset();
-       void set_division_4( int division_4_i );
-       void set_key( int accidentals_i, int minor_i );
-       void set_tempo( int useconds_i );
-       void set_time( int num_i, int den_i, int clocks_i, int count_32_i );
-
-       int bar_i_;
-       int track_i_;
-       String filename_str_;
-       String copyright_str_;
-       String instrument_str_;
-       String track_name_str_;
-
-       Midi_key* midi_key_p_;
-       Midi_tempo* midi_tempo_p_;
-       Midi_time* midi_time_p_;
+    My_midi_parser( String filename_str,Sources * );
+    ~My_midi_parser();
+
+    void add_score( Midi_score* midi_score_p );
+    void error( char const* sz_l );
+    int parse();
+    void forward( int i );
+    Moment mom();
+    void note_begin( int channel_i, int pitch_i, int dyn_i );
+    Midi_event* note_end_midi_event_p( int channel_i, int pitch_i, int dyn_i );
+    int output_mudela( String filename_str );
+    void reset();
+    void set_division_4( int division_4_i );
+    void set_key( int accidentals_i, int minor_i );
+    void set_tempo( int useconds_per_4_i );
+    void set_time( int num_i, int den_i, int clocks_i, int count_32_i );
+
+    int bar_i_;
+    int track_i_;
+    String filename_str_;
+    String copyright_str_;
+    String instrument_str_;
+    String track_name_str_;
+
+    Midi_key* midi_key_p_;
+    Midi_tempo* midi_tempo_p_;
+    Midi_time* midi_time_p_;
 
 private:
-       I64 now_i64_;   // 31 bits yields tipically about 1000 bars
+    I64 now_i64_;      // 31 bits yields tipically about 1000 bars
 
-       static int const CHANNELS_i = 16;
-       static int const PITCHES_i = 128;
-       I64 running_i64_i64_a_[ CHANNELS_i ][ PITCHES_i ];
+    static int const CHANNELS_i = 16;
+    static int const PITCHES_i = 128;
+    I64 running_i64_i64_a_[ CHANNELS_i ][ PITCHES_i ];
 
-       Midi_score* midi_score_p_;
-       int division_1_i_;
+    Midi_score* midi_score_p_;
+    int division_1_i_;
 
-       char const* defined_ch_c_l_;
-       int fatal_error_i_;
-       My_midi_lexer* midi_lexer_p_;
+    char const* defined_ch_C_;
+    int fatal_error_i_;
+    My_midi_lexer* midi_lexer_p_;
 };
 
 extern My_midi_parser* midi_parser_l_g;