Fix warnings.

[ardour.git] / libs / midi++2 / jack_midiport.cc

diff --git a/libs/midi++2/jack_midiport.cc b/libs/midi++2/jack_midiport.cc
index fc1ba234a3b4f27c3253a5bcc5c73a135fe1f0e6..0eb867ebe72b963a8a9716fd57ad0ffd2c93f886 100644 (file)
--- a/libs/midi++2/jack_midiport.cc
+++ b/libs/midi++2/jack_midiport.cc
@@ -60,31 +60,41 @@ JACK_MidiPort::cycle_start (nframes_t nframes)
        _last_read_index = 0;
        _last_write_timestamp = 0;
 
-       // output
-       void *buffer = jack_port_get_buffer (_jack_output_port, nframes);
-       jack_midi_clear_buffer (buffer);
-       flush (buffer);
+       if (_jack_output_port != 0) {
+               // output
+               void *buffer = jack_port_get_buffer (_jack_output_port, nframes);
+               jack_midi_clear_buffer (buffer);
+               flush (buffer); 
+       }
        
-       // input
-       void* jack_buffer = jack_port_get_buffer(_jack_input_port, nframes);
-       const nframes_t event_count = jack_midi_get_event_count(jack_buffer);
+       if (_jack_input_port != 0) {
+               // input
+               void* jack_buffer = jack_port_get_buffer(_jack_input_port, nframes);
+               const nframes_t event_count = jack_midi_get_event_count(jack_buffer);
 
-       jack_midi_event_t ev;
+               jack_midi_event_t ev;
 
-       for (nframes_t i=0; i < event_count; ++i) {
+               for (nframes_t i=0; i < event_count; ++i) {
 
-               jack_midi_event_get (&ev, jack_buffer, i);
+                       jack_midi_event_get (&ev, jack_buffer, i);
 
-               if (input_parser) {
-                       input_parser->raw_preparse (*input_parser, ev.buffer, ev.size);
-                       for (size_t i = 0; i < ev.size; i++) {
-                               input_parser->scanner (ev.buffer[i]);
-                       }       
-                       input_parser->raw_postparse (*input_parser, ev.buffer, ev.size);
-               }
+                       if (input_parser) {
+                               for (size_t i = 0; i < ev.size; i++) {
+                                       // the midi events here are used for MIDI clock only
+                                       input_parser->set_midi_clock_timestamp(ev.time + jack_last_frame_time(_jack_client));
+                                       input_parser->scanner (ev.buffer[i]);
+                               }       
+                       }
+               }       
        }
 }
 
+void
+JACK_MidiPort::cycle_end ()
+{
+       flush(jack_port_get_buffer(_jack_output_port, _nframes_this_cycle));
+}
+
 int
 JACK_MidiPort::write(byte * msg, size_t msglen, timestamp_t timestamp)
 {
@@ -93,13 +103,12 @@ JACK_MidiPort::write(byte * msg, size_t msglen, timestamp_t timestamp)
        if (!is_process_thread()) {
 
                Glib::Mutex::Lock lm (non_process_thread_fifo_lock);
-               RingBuffer<Evoral::Event>::rw_vector vec;
+               RingBuffer< Evoral::Event<double> >::rw_vector vec;
                
                non_process_thread_fifo.get_write_vector (&vec);
 
                if (vec.len[0] + vec.len[1] < 1) {
-                       error << "no space in FIFO for non-process thread MIDI write"
-                             << endmsg;
+                       error << "no space in FIFO for non-process thread MIDI write" << endmsg;
                        return 0;
                }
 
@@ -157,7 +166,7 @@ JACK_MidiPort::write(byte * msg, size_t msglen, timestamp_t timestamp)
 void
 JACK_MidiPort::flush (void* jack_port_buffer)
 {
-       RingBuffer<Evoral::Event>::rw_vector vec;
+       RingBuffer< Evoral::Event<double> >::rw_vector vec;
        size_t written;
 
        non_process_thread_fifo.get_read_vector (&vec);
@@ -167,7 +176,7 @@ JACK_MidiPort::flush (void* jack_port_buffer)
        }
 
        if (vec.len[0]) {
-               Evoral::Event* evp = vec.buf[0];
+               Evoral::Event<double>* evp = vec.buf[0];
                
                for (size_t n = 0; n < vec.len[0]; ++n, ++evp) {
                        jack_midi_event_write (jack_port_buffer,
@@ -176,7 +185,7 @@ JACK_MidiPort::flush (void* jack_port_buffer)
        }
        
        if (vec.len[1]) {
-               Evoral::Event* evp = vec.buf[1];
+               Evoral::Event<double>* evp = vec.buf[1];
 
                for (size_t n = 0; n < vec.len[1]; ++n, ++evp) {
                        jack_midi_event_write (jack_port_buffer,
@@ -197,6 +206,8 @@ JACK_MidiPort::read(byte * buf, size_t bufsize)
        
        jack_midi_event_t ev;
 
+       cerr << "JACK_MidiPort::read called" << endl;
+       
        int err = jack_midi_event_get (&ev,
                                       jack_port_get_buffer(_jack_input_port, _nframes_this_cycle),
                                       _last_read_index++);
@@ -237,7 +248,9 @@ JACK_MidiPort::create_ports(const XMLNode& node)
                _jack_output_port = jack_port_register(_jack_client,
                                                       string(desc.tag).append("_out").c_str(),
                                                       JACK_DEFAULT_MIDI_TYPE, JackPortIsOutput, 0);
-               jack_midi_clear_buffer(jack_port_get_buffer(_jack_output_port, nframes));
+               if (_jack_output_port) {
+                       jack_midi_clear_buffer(jack_port_get_buffer(_jack_output_port, nframes));
+               }
                ret = ret && (_jack_output_port != NULL);
        }
        
@@ -245,7 +258,9 @@ JACK_MidiPort::create_ports(const XMLNode& node)
                _jack_input_port = jack_port_register(_jack_client,
                                                      string(desc.tag).append("_in").c_str(),
                                                      JACK_DEFAULT_MIDI_TYPE, JackPortIsInput, 0);
-               jack_midi_clear_buffer(jack_port_get_buffer(_jack_input_port, nframes));
+               if (_jack_input_port) {
+                       jack_midi_clear_buffer(jack_port_get_buffer(_jack_input_port, nframes));
+               }
                ret = ret && (_jack_input_port != NULL);
        }