comparison data/fileio/MIDIFileWriter.cpp @ 996:0d3d1ec7dfde

Add MIDI channel to note data and MIDI writer

     m_timingDivision = 480;
     m_format = MIDI_SINGLE_TRACK_FILE;
     m_numberOfTracks = 1;
 
     int track = 0;
-    int midiChannel = 0;
 
     MIDIEvent *event;
 
     event = new MIDIEvent(0, MIDI_FILE_META_EVENT, MIDI_CUE_POINT,
                           "Exported from Sonic Visualiser");

 
         int frame = i->start;
         int duration = i->duration;
         int pitch = i->midiPitch;
         int velocity = i->velocity;
+        int channel = i->channel;
 
         if (pitch < 0) pitch = 0;
         if (pitch > 127) pitch = 127;
+
+        if (channel < 0) channel = 0;
+        if (channel > 15) channel = 0;
 
         // Convert frame to MIDI time
 
         double seconds = double(frame) / double(m_sampleRate);
         double quarters = (seconds * m_tempo) / 60.0;

         // in the delta time fields.  We resolve these into delta
         // times further down (can't do it until all the note offs are
         // in place).
 
         event = new MIDIEvent(midiTime,
-                              MIDI_NOTE_ON | midiChannel,
+                              MIDI_NOTE_ON | channel,
                               pitch,
                               velocity);
         m_midiComposition[track].push_back(event);
 
         event = new MIDIEvent(endTime,
-                              MIDI_NOTE_OFF | midiChannel,
+                              MIDI_NOTE_OFF | channel,
                               pitch,
                               127); // loudest silence you can muster
 
         m_midiComposition[track].push_back(event);
     }