release: 0.0.63

[lilypond.git] / mi2mu / midi-voice.cc

diff --git a/mi2mu/midi-voice.cc b/mi2mu/midi-voice.cc
index 21cac0482c1e015f900efe58dccca8aeffde1fef..77a6526ef855320830ce2b0892b6ebad6da06672 100644 (file)
--- a/mi2mu/midi-voice.cc
+++ b/mi2mu/midi-voice.cc
@@ -15,7 +15,11 @@ Midi_voice::Midi_voice( Moment begin_mom )
 void
 Midi_voice::add_event( Midi_event* midi_event_p )
 {
+#ifdef MEVENT_LIST
        midi_event_p_list_.bottom().add( midi_event_p );
+#else
+       midi_event_p_array_.push( midi_event_p );
+#endif
 }
 
 Moment 
@@ -27,6 +31,7 @@ Midi_voice::begin_mom()
 Moment 
 Midi_voice::end_mom()
 {
+#ifdef MEVENT_LIST
 //     if ( events_i_ == midi_event_p_list_.length_i() )
        if ( events_i_ == midi_event_p_list_.size() )
                return end_mom_;
@@ -41,6 +46,20 @@ Midi_voice::end_mom()
 //     events_i_ = midi_event_p_list_.length_i();
        events_i_ = midi_event_p_list_.size();
        return end_mom_;
+#else
+       if ( events_i_ == midi_event_p_array_.size() )
+               return end_mom_;
+       Moment now_mom = begin_mom_;
+       tor( DEBUG_ver ) << now_mom << ", ";
+       for ( int i = 0; i < midi_event_p_array_.size(); i++ ) {
+               tor( DEBUG_ver ) << now_mom << ", ";
+               now_mom += midi_event_p_array_[ i ]->mom();
+       }
+       tor( DEBUG_ver ) << endl;
+       end_mom_ = now_mom;
+       events_i_ = midi_event_p_array_.size();
+       return end_mom_;
+#endif
 }
 
 String 
@@ -48,12 +67,15 @@ Midi_voice::mudela_str( Moment from_mom, Moment to_mom, bool multiple_bo )
 {
        String str;
 
-       if ( begin_mom() >= to_mom )
+//     if ( begin_mom() >= to_mom )
+       if ( begin_mom() > to_mom )
                return "";
-       if ( end_mom() <= from_mom )
+//     if ( end_mom() <= from_mom )
+       if ( end_mom() < from_mom )
                return "";
        
        Moment now_mom = begin_mom();
+#ifdef MEVENT_LIST
        PCursor<Midi_event*> i( midi_event_p_list_.top() );
        for ( ; i.ok() && now_mom < from_mom ; i++ )
                now_mom += i->mom();
@@ -62,6 +84,16 @@ Midi_voice::mudela_str( Moment from_mom, Moment to_mom, bool multiple_bo )
                now_mom += i->mom();
                str += i->mudela_str( false ) + " ";
        }
+#else
+       int i = 0;
+       for ( ; i < midi_event_p_array_.size() && now_mom < from_mom ; i++ )
+               now_mom += midi_event_p_array_[ i ]->mom();
+       
+       for ( ; i < midi_event_p_array_.size() && now_mom < to_mom ; i++ ) {
+               now_mom += midi_event_p_array_[ i ]->mom();
+               str += midi_event_p_array_[ i ]->mudela_str( false ) + " ";
+       }
+#endif
        
        if ( str.length_i() && multiple_bo )
                str = "{ " + str + "} ";