lilypond-0.0.42

diff --git a/mi2mu/include/midi-global.hh b/mi2mu/include/midi-global.hh
index 0e8644376dac424ec2228e54f0b14289d3b34223..0ab49a340db85af3d43fad6e29c3e6c6db2aeb09 100644 (file)
--- a/mi2mu/include/midi-global.hh
+++ b/mi2mu/include/midi-global.hh
@@ -14,6 +14,9 @@ extern Verbose level_ver;
 #ifdef NPRINT
 #define dtor if ( 0 ) *monitor_p_g
 #define mtor if ( 0 ) *monitor_p_g
+#define vtor if ( level_ver >= VERBOSE_ver ) *monitor_p_g
+#define btor if ( level_ver >= BRIEF_ver ) *monitor_p_g
+#define qtor if ( level_ver >= QUIET_ver ) *monitor_p_g
 #else
 #define dtor if ( level_ver >= DEBUG_ver ) *monitor_p_g
 #define vtor if ( level_ver >= VERBOSE_ver ) *monitor_p_g
@@ -27,7 +30,7 @@ void message( String message_str, char const* context_ch_c_l );
 void warning( String message_str, char const* context_ch_c_l );
 void error( String message_str, char const* context_ch_c_l );
 
-String version_str();
+String mi2mu_version_str();
 
 #endif // MIDI_GLOBAL_HH
 

diff --git a/mi2mu/main.cc b/mi2mu/main.cc
index 023a4fed2646c55170458e9f62dfe699934f50d7..e04cb02b0968d805e1115bbdb33da8fa7b667143 100644 (file)
--- a/mi2mu/main.cc
+++ b/mi2mu/main.cc
@@ -60,7 +60,7 @@ error( String message_str, char const* context_ch_c_l )
 void
 help()
 {
-    btor <<
+    mtor <<
        "--be-blonde, -b                use exact, blonde durations, e.g.: a[385]\n"
        "--debug, -d            be really verbose\n"
        "--help, -h             this help\n"
@@ -76,7 +76,7 @@ help()
 void
 identify()
 {
-       mtor << version_str() << endl;
+       mtor << mi2mu_version_str() << endl;
 }
     
 void