lilypond-0.0.44

diff --git a/mi2mu/my-midi-parser.cc b/mi2mu/my-midi-parser.cc
index 5e6c2ced7d71e8e5549eece8e5e21b97effdc055..9a7ece723b412c50676f1f86ee70e48a3538f26c 100644 (file)
--- a/mi2mu/my-midi-parser.cc
+++ b/mi2mu/my-midi-parser.cc
@@ -14,12 +14,13 @@ yyerror(char const* sz_l )
 
 My_midi_parser* midi_parser_l_g = 0;
 
-My_midi_parser::My_midi_parser( String filename_str )
+My_midi_parser::My_midi_parser( String filename_str, Sources *sources_l )
 {
-       midi_parser_l_g = this;
        filename_str_ = filename_str;
-       midi_lexer_p_ = new My_midi_lexer( filename_str_ );
-       defined_ch_c_l_ = 0;
+       midi_lexer_p_ = new My_midi_lexer( filename_str_,sources_l );
+       midi_lexer_l_g = midi_lexer_p_; // ugh
+
+       defined_ch_C_ = 0;
        fatal_error_i_ = 0;
        midi_key_p_ = 0;
        midi_score_p_ = 0;
@@ -32,8 +33,9 @@ My_midi_parser::My_midi_parser( String filename_str )
 
 My_midi_parser::~My_midi_parser()
 {
+    midi_lexer_l_g = 0;        // ugh
+
        delete midi_lexer_p_;
-       midi_parser_l_g = 0;
        delete midi_key_p_;
        delete midi_tempo_p_;
        delete midi_time_p_;

diff --git a/mi2mu/version.cc b/mi2mu/version.cc
index d9fe95dac7cb88134f6c2b1ff1e1d2758058b260..3eb7e4d25c358830924e7df90e9cea3d4fc3c430 100644 (file)
--- a/mi2mu/version.cc
+++ b/mi2mu/version.cc
@@ -7,7 +7,7 @@ String
 mi2mu_version_str()
 {
        return String ( "This is " ) + mi2mu_version_sz()
-               + flower_version_sz()
+           + "/" + flower_version_sz()
                + " of " +  __DATE__ + " " + __TIME__;
 }