From: fred <fred>
Date: Sun, 24 Mar 2002 19:53:24 +0000 (+0000)
Subject: lilypond-0.1.7
X-Git-Tag: release/1.5.59~4141
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=69e8b19881fdc87cd24d6c1987e236a6290fbb9f;p=lilypond.git

lilypond-0.1.7
---

diff --git a/mi2mu/main.cc b/mi2mu/main.cc
index f447a181db..a50cf55ff6 100644
--- a/mi2mu/main.cc
+++ b/mi2mu/main.cc
@@ -93,7 +93,7 @@ main( int argc_i, char* argv_sz_a[] )
 	Getopt_long getopt_long( argc_i, argv_sz_a, long_option_init_a );
 
 	String output_str;
-	while ( Long_option_init* long_option_init_p = getopt_long() )
+	while ( Long_option_init const* long_option_init_p = getopt_long() )
 		switch ( long_option_init_p->shortname ) {
 		case 'b':
 			Duration_convert::no_quantify_b_s = true;
@@ -115,7 +115,7 @@ main( int argc_i, char* argv_sz_a[] )
 			Duration_convert::no_smaller_than_i_s = 32;
 			break;
 		case 'o':
-			output_str = getopt_long.optarg;
+			output_str = getopt_long.optional_argument_ch_C_;
 			break;
 		case 'p':
 			Duration_convert::no_triplets_b_s = true;
@@ -124,7 +124,7 @@ main( int argc_i, char* argv_sz_a[] )
 			level_ver = QUIET_ver;
 			break;
 		case 's': {
-				int i = String_convert::dec2_i( getopt_long.optarg );
+				int i = String_convert::dec2_i( getopt_long.optional_argument_ch_C_ );
 				if ( !i ) {
 					identify();
 					usage();
@@ -152,7 +152,7 @@ main( int argc_i, char* argv_sz_a[] )
 	// flag -q must be checked first
 	identify();
 
-	char* arg_sz = 0;
+	char const* arg_sz = 0;
 	while ( ( arg_sz = getopt_long.get_next_arg() ) ) {
 		My_midi_parser midi_parser( arg_sz, & source );
 		midi_parser_l_g = &midi_parser;
diff --git a/mi2mu/midi-event.cc b/mi2mu/midi-event.cc
index f698cde71c..712a5ae941 100644
--- a/mi2mu/midi-event.cc
+++ b/mi2mu/midi-event.cc
@@ -175,12 +175,13 @@ Midi_text::mudela_str( bool command_mode_bo )
 		|| ( text_str_.length_i() != (int)strlen( text_str_.ch_C() ) ) )
 		return "";
 
-	return "% " + text_str_ + "\n\t";
+	return "% " + text_str_ + "\n";
 }
 
 Midi_time::Midi_time( int num_i, int den_i, int clocks_4_i, int count_32_i )
-	: sync_dur_( 8 )
 {
+	sync_dur_.type_i_ = 8;
+	
 	sync_f_ = 1.0;
 	if ( count_32_i != 8 )
 		warning( String( "#32 in quarter: " ) + String( count_32_i ));
@@ -192,7 +193,9 @@ Midi_time::Midi_time( int num_i, int den_i, int clocks_4_i, int count_32_i )
 Moment
 Midi_time::bar_mom()
 {
-	return Moment( num_i_ ) * Duration_convert::dur2_mom( Duration( 1 << den_i_ ) );
+    Duration d;
+    d.type_i_ =  1 << den_i_ ;
+	return Moment( num_i_ ) * Duration_convert::dur2_mom( d );
 }
 
 int
diff --git a/mi2mu/my-midi-parser.cc b/mi2mu/my-midi-parser.cc
index e3a4c988cc..7c86998486 100644
--- a/mi2mu/my-midi-parser.cc
+++ b/mi2mu/my-midi-parser.cc
@@ -121,7 +121,8 @@ My_midi_parser::note_end_midi_event_p( int channel_i, int pitch_i, int dyn_i )
 //	running_i64_i64_a_[ channel_i ][ pitch_i ] = -1;
 //	assert( start_i64 != -1 ); // did we start?
 
-	Duration dur( 0 );
+	Duration dur;
+	dur.type_i_ = 0;
 	if ( Duration_convert::no_quantify_b_s )
 		dur = Duration_convert::ticks2_dur( (I64)now_i64_ - start_i64 );
 	else {