release: 0.0.53

[lilypond.git] / lily / midi-walker.cc

diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc
index 4a1674c7f7a043feb802f2e9058b679997bb8865..3f24638236cb262999c9db8b93ea5838190c1090 100644 (file)
--- a/lily/midi-walker.cc
+++ b/lily/midi-walker.cc
@@ -6,8 +6,9 @@
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>, Jan Nieuwenhuizen <jan@digicash.com>
 */
 
-#include "musicalrequest.hh"
-#include "pscore.hh"
+#include "command-request.hh"
+#include "musical-request.hh"
+#include "p-score.hh"
 #include "staff.hh"
 #include "midi-walker.hh"
 #include "midi-item.hh"
@@ -28,9 +29,13 @@ Midi_walker::Midi_walker(Staff *st_l, Midi_track* track_l)
 void
 Midi_walker::do_stop_notes(Moment max_moment)
 {
-    while (stop_notes.size() && stop_notes.front_idx() <= max_moment) {
-       Moment stop_moment = stop_notes.front_idx();
-       Melodic_req * req_l = stop_notes.get();
+    while (stop_notes.size() && stop_notes.front().key <= max_moment) {
+       Note_event  ent=stop_notes.get();
+       if (ent.ignore_b_) 
+           continue;
+       
+       Moment stop_moment = ent.key;
+       Melodic_req * req_l = ent.val;
        
        Midi_note note(req_l, track_l_->number_i_, false);
        output_event(note, stop_moment);
@@ -42,21 +47,23 @@ Midi_walker::do_stop_notes(Moment max_moment)
 void 
 Midi_walker::do_start_note(Note_req*note_l)
 {
-    Moment stop=note_l->duration() + ptr()->when();
-    for(int i=0; i < stop_notes.size(); i++)
-       if (stop_notes.value_arr_[i]->melodic()->pitch() ==
+    Moment stop = note_l->duration() + ptr()->when();
+    for(int i=0; i < stop_notes.size(); i++) {
+       if (stop_notes[i].val->melodic()->pitch() ==
            note_l->pitch()) {
-            if ( stop_notes.indices_arr_[i] < stop){
-                
-                stop_notes.del(i);
-                return ;  // removing this gives a feature ( ${c2 c4}$ output correctly)
-            }
-            else
-                return; // skip the stop note 
-            break;// do the stop note               
+           if ( stop_notes[i].key < stop){
+               stop_notes[i].ignore_b_=true;
+           }
+           else
+               return; // skip the stop note 
        }
+    }
+    Note_event e;
+    e.val = note_l;
+    e.key = stop;
+    
+    stop_notes.insert(e);
     
-    stop_notes.enter(note_l,  stop);
     Midi_note note(note_l, track_l_->number_i_, true);
     output_event(note, ptr()->when());
 }
@@ -76,8 +83,23 @@ void
 Midi_walker::process_requests()
 {
     do_stop_notes(ptr()->when());
-    for ( int i = 0; i < ptr()->musicalreq_l_arr_.size(); i++ )  {
 
+    for ( int i = 0; i < ptr()->commandreq_l_arr_.size(); i++ )  {
+       Command_req *c_l = ptr()->commandreq_l_arr_[i]->command();
+       Meter_change_req* meter_l = c_l->meterchange();
+       if ( meter_l )
+           output_event( Midi_time( meter_l->beats_i_, meter_l->one_beat_i_, 18 ),  0 );
+       Key_change_req* key_l = c_l->keychange();
+       if ( key_l ) {
+           int sharps_i = key_l->sharps_i();
+           int flats_i = key_l->flats_i();
+           // midi cannot handle non-conventional keys
+           if ( !( flats_i && sharps_i ) )
+               output_event( Midi_key( sharps_i - flats_i, key_l->minor_b() ), 0 );
+       }
+    }
+
+    for ( int i = 0; i < ptr()->musicalreq_l_arr_.size(); i++ )  {
        Rhythmic_req *n = ptr()->musicalreq_l_arr_[i]->rhythmic();
        if ( !n)
            continue;
@@ -85,7 +107,6 @@ Midi_walker::process_requests()
        if (!note_l)
            continue;
        do_start_note(note_l);
-       
     }
 }
 
@@ -93,3 +114,10 @@ Midi_walker::~Midi_walker()
 {
     do_stop_notes( last_moment_ + Moment(10,1)); // ugh
 }
+
+
+int
+compare(Note_event const&e1, Note_event const&e2)
+{
+    return sign(e1.key - e2.key);
+}