VKeybd: Set default MIDI port flags

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

diff --git a/libs/ardour/port_manager.cc b/libs/ardour/port_manager.cc
index 75d93af320b5b50bf57b0c3aba865fa602a6c2be..d423ddbd741611634e8fc4c1d385af2f98d9d551 100644 (file)
--- a/libs/ardour/port_manager.cc
+++ b/libs/ardour/port_manager.cc
@@ -642,14 +642,12 @@ PortManager::reconnect_ports ()
 {
        boost::shared_ptr<Ports> p = ports.reader ();
 
-       if (!Profile->get_trx()) {
-               /* re-establish connections */
+       /* re-establish connections */
 
-               DEBUG_TRACE (DEBUG::Ports, string_compose ("reconnect %1 ports\n", p->size()));
+       DEBUG_TRACE (DEBUG::Ports, string_compose ("reconnect %1 ports\n", p->size()));
 
-               for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
-                       i->second->reconnect ();
-               }
+       for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
+               i->second->reconnect ();
        }
 
        return 0;
@@ -658,6 +656,8 @@ PortManager::reconnect_ports ()
 void
 PortManager::connect_callback (const string& a, const string& b, bool conn)
 {
+       DEBUG_TRACE (DEBUG::BackendCallbacks, string_compose (X_("connect callback %1 + %2 connected ? %3\n"), a, b, conn));
+
        boost::shared_ptr<Port> port_a;
        boost::shared_ptr<Port> port_b;
        Ports::iterator x;
@@ -697,6 +697,8 @@ PortManager::connect_callback (const string& a, const string& b, bool conn)
 void
 PortManager::registration_callback ()
 {
+       DEBUG_TRACE (DEBUG::BackendCallbacks, "port registration callback\n");
+
        if (!_port_remove_in_progress) {
 
                {
@@ -769,6 +771,8 @@ PortManager::my_name() const
 int
 PortManager::graph_order_callback ()
 {
+       DEBUG_TRACE (DEBUG::BackendCallbacks, "graph order callback\n");
+
        if (!_port_remove_in_progress) {
                GraphReordered(); /* EMIT SIGNAL */
        }
@@ -803,7 +807,7 @@ PortManager::cycle_start (pframes_t nframes, Session* s)
         *    A single external source-port may be connected to many ardour
         *    input-ports. Currently re-sampling is per input.
         */
-       if (0 && s && s->rt_tasklist () && fabs (Port::speed_ratio ()) != 1.0) {
+       if (s && s->rt_tasklist () && fabs (Port::speed_ratio ()) != 1.0) {
                RTTaskList::TaskList tl;
                for (Ports::iterator p = _cycle_ports->begin(); p != _cycle_ports->end(); ++p) {
                        if (!(p->second->flags() & TransportMasterPort)) {
@@ -841,7 +845,9 @@ PortManager::cycle_end (pframes_t nframes, Session* s)
        }
 
        for (Ports::iterator p = _cycle_ports->begin(); p != _cycle_ports->end(); ++p) {
-               p->second->flush_buffers (nframes);
+               /* AudioEngine::split_cycle flushes buffers until Port::port_offset.
+                * Now only flush remaining events (after Port::port_offset) */
+               p->second->flush_buffers (nframes - Port::port_offset ());
        }
 
        _cycle_ports.reset ();
@@ -1264,7 +1270,8 @@ PortManager::fill_midi_port_info_locked ()
 
        for (vector<string>::iterator p = ports.begin(); p != ports.end(); ++p) {
 
-               if (port_is_mine (*p)) {
+               /* ugly hack, ideally we'd use a port-flag, or at vkbd_output_port()->name() */
+               if (port_is_mine (*p) && *p != _backend->my_name() + ":" + _("Virtual Keyboard")) {
                        continue;
                }
 
@@ -1274,6 +1281,8 @@ PortManager::fill_midi_port_info_locked ()
 
                        if (port_is_control_only (*p)) {
                                flags = MidiPortControl;
+                       } else if (*p == _backend->my_name() + ":" + _("Virtual Keyboard")) {
+                               flags = MidiPortFlags(MidiPortSelection | MidiPortMusic);
                        }
 
                        MidiPortInformation mpi (_backend->name(), *p, true, flags, true);