X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_track.cc;h=8cc3a453d02ecd619c9dc82b045b831a04186089;hb=30ab1fd61569f9d7fb7410d483fa68cbf9865c37;hp=93eba11a3011f9e58dc3ed500c23fe55a950ec6d;hpb=30c08ba655330232767554c48bda1975bfb5628c;p=ardour.git

diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index 93eba11a30..8cc3a453d0 100644
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -386,24 +386,23 @@ MidiTrack::set_state_part_two ()
 	return;
 }	
 
-uint32_t
+ChanCount
 MidiTrack::n_process_buffers ()
 {
-	return max ((uint32_t) _diskstream->n_channels(), redirect_max_outs);
+	return max (_diskstream->n_channels(), redirect_max_outs);
 }
 
 void
 MidiTrack::passthru_silence (jack_nframes_t start_frame, jack_nframes_t end_frame, jack_nframes_t nframes, jack_nframes_t offset, int declick, bool meter)
 {
-	uint32_t nbufs = n_process_buffers ();
-	process_output_buffers (_session.get_silent_buffers (nbufs), nbufs, start_frame, end_frame, nframes, offset, true, declick, meter);
+	process_output_buffers (_session.get_silent_buffers (n_process_buffers()), start_frame, end_frame, nframes, offset, true, declick, meter);
 }
 
 int 
 MidiTrack::no_roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t end_frame, jack_nframes_t offset, 
 		     bool session_state_changing, bool can_record, bool rec_monitors_input)
 {
-	if (n_outputs() == 0) {
+	if (n_outputs().get(DataType::MIDI) == 0) {
 		return 0;
 	}
 
@@ -490,7 +489,7 @@ int
 MidiTrack::silent_roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t end_frame, jack_nframes_t offset, 
 			 bool can_record, bool rec_monitors_input)
 {
-	if (n_outputs() == 0 && _redirects.empty()) {
+	if (n_outputs().get(DataType::MIDI) == 0 && _redirects.empty()) {
 		return 0;
 	}
 
@@ -508,7 +507,7 @@ MidiTrack::silent_roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack
 }
 
 void
-MidiTrack::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
+MidiTrack::process_output_buffers (BufferSet& bufs,
 			       jack_nframes_t start_frame, jack_nframes_t end_frame, 
 			       jack_nframes_t nframes, jack_nframes_t offset, bool with_redirects, int declick,
 			       bool meter)
@@ -539,9 +538,9 @@ MidiTrack::set_name (string str, void *src)
 }
 
 int
-MidiTrack::export_stuff (vector<unsigned char*>& buffers, uint32_t nbufs, jack_nframes_t start, jack_nframes_t nframes)
+MidiTrack::export_stuff (BufferSet& bufs, jack_nframes_t nframes, jack_nframes_t end_frame)
 {
-	return 0;
+	return -1;
 }
 
 void