in compute_gains in case _speakers.n_tuples is 0. Prevent NaN gains if total power...

[ardour.git] / libs / ardour / midi_ui.cc

diff --git a/libs/ardour/midi_ui.cc b/libs/ardour/midi_ui.cc
index be13209513f27ea19dd5d52b49edb56e5e5fb21a..fecbf9b8e32ab2cb121e78d6d71f36d761df2d0c 100644 (file)
--- a/libs/ardour/midi_ui.cc
+++ b/libs/ardour/midi_ui.cc
@@ -104,12 +104,10 @@ MidiControlUI::midi_input_handler (IOCondition ioc, MIDI::Port* port)
 
        if (ioc & IO_IN) {
 
-               if (port->must_drain_selectable()) {
-                       CrossThreadChannel::drain (port->selectable());
-               }
+               CrossThreadChannel::drain (port->selectable());
 
                DEBUG_TRACE (DEBUG::MidiIO, string_compose ("data available on %1\n", port->name()));
-               nframes64_t now = _session.engine().frame_time();
+               framepos_t now = _session.engine().frame_time();
                port->parse (now);
        }
 
@@ -160,8 +158,6 @@ MidiControlUI::thread_init ()
        strcpy (c, X_("midiUI"));
        pthread_set_name (c);
 
-       cerr << "MIDI UI running\n";
-
        PBD::notify_gui_about_thread_creation (X_("gui"), pthread_self(), X_("MIDI"), 2048);
        SessionEvent::create_per_thread_pool (X_("MIDI I/O"), 128);