change placement of ruler divider so that the lower line is at the specified height...

[ardour.git] / gtk2_ardour / port_group.cc

diff --git a/gtk2_ardour/port_group.cc b/gtk2_ardour/port_group.cc
index 5b4f151da8d751f28746a67886fe79dd8b279a37..448a8d3cf55840bb0a45728bf2d350cfb63253fa 100644 (file)
--- a/gtk2_ardour/port_group.cc
+++ b/gtk2_ardour/port_group.cc
@@ -21,7 +21,6 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/algorithm/string.hpp>
 
-#include "midi++/manager.h"
 #include "midi++/mmc.h"
 
 #include "ardour/audioengine.h"
@@ -29,9 +28,12 @@
 #include "ardour/bundle.h"
 #include "ardour/control_protocol_manager.h"
 #include "ardour/io_processor.h"
+#include "ardour/midi_port.h"
+#include "ardour/midiport_manager.h"
 #include "ardour/session.h"
 #include "ardour/user_bundle.h"
 #include "ardour/port.h"
+
 #include "control_protocol/control_protocol.h"
 
 #include "gui_thread.h"
@@ -313,7 +315,7 @@ struct RouteIOs {
 class RouteIOsComparator {
 public:
        bool operator() (RouteIOs const & a, RouteIOs const & b) {
-               return a.route->order_key (EditorSort) < b.route->order_key (EditorSort);
+               return a.route->order_key () < b.route->order_key ();
        }
 };
 
@@ -436,7 +438,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
                ardour->add_bundle (ltc);
        }
 
-       /* Ardour's surfaces */
+       /* Ardour's control surfaces */
 
        ControlProtocolManager& m = ControlProtocolManager::instance ();
        for (list<ControlProtocolInfo*>::iterator i = m.control_protocol_info.begin(); i != m.control_protocol_info.end(); ++i) {
@@ -452,37 +454,35 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
 
        /* Ardour's sync ports */
 
-       MIDI::Manager* midi_manager = MIDI::Manager::instance ();
-       if (midi_manager && (type == DataType::MIDI || type == DataType::NIL)) {
+       if ((type == DataType::MIDI || type == DataType::NIL)) {
                boost::shared_ptr<Bundle> sync (new Bundle (_("Sync"), inputs));
-               MIDI::MachineControl* mmc = midi_manager->mmc ();
-               AudioEngine& ae = session->engine ();
+               AudioEngine* ae = AudioEngine::instance();
 
                if (inputs) {
                        sync->add_channel (
-                               _("MTC in"), DataType::MIDI, ae.make_port_name_non_relative (midi_manager->mtc_input_port()->name())
+                               _("MTC in"), DataType::MIDI, ae->make_port_name_non_relative (session->mtc_input_port()->name())
                                );
                        sync->add_channel (
-                               _("MIDI control in"), DataType::MIDI, ae.make_port_name_non_relative (midi_manager->midi_input_port()->name())
+                               _("MIDI control in"), DataType::MIDI, ae->make_port_name_non_relative (session->midi_input_port()->name())
                                );
                        sync->add_channel (
-                               _("MIDI clock in"), DataType::MIDI, ae.make_port_name_non_relative (midi_manager->midi_clock_input_port()->name())
+                               _("MIDI clock in"), DataType::MIDI, ae->make_port_name_non_relative (session->midi_clock_input_port()->name())
                                );
                        sync->add_channel (
-                               _("MMC in"), DataType::MIDI, ae.make_port_name_non_relative (mmc->input_port()->name())
+                               _("MMC in"), DataType::MIDI, ae->make_port_name_non_relative (session->mmc_input_port()->name())
                                );
                } else {
                        sync->add_channel (
-                               _("MTC out"), DataType::MIDI, ae.make_port_name_non_relative (midi_manager->mtc_output_port()->name())
+                               _("MTC out"), DataType::MIDI, ae->make_port_name_non_relative (session->mtc_output_port()->name())
                                );
                        sync->add_channel (
-                               _("MIDI control out"), DataType::MIDI, ae.make_port_name_non_relative (midi_manager->midi_output_port()->name())
+                               _("MIDI control out"), DataType::MIDI, ae->make_port_name_non_relative (session->midi_output_port()->name())
                                );
                        sync->add_channel (
-                               _("MIDI clock out"), DataType::MIDI, ae.make_port_name_non_relative (midi_manager->midi_clock_output_port()->name())
+                               _("MIDI clock out"), DataType::MIDI, ae->make_port_name_non_relative (session->midi_clock_output_port()->name())
                                );
                        sync->add_channel (
-                               _("MMC out"), DataType::MIDI, ae.make_port_name_non_relative (mmc->output_port()->name())
+                               _("MMC out"), DataType::MIDI, ae->make_port_name_non_relative (session->mmc_output_port()->name())
                                );
                }
 
@@ -610,7 +610,12 @@ PortGroupList::make_bundle_from_ports (std::vector<std::string> const & p, ARDOU
        }
 
        for (uint32_t j = 0; j < p.size(); ++j) {
-               b->add_channel (p[j].substr (pre.length()), type);
+               std::string n = p[j].substr (pre.length());
+               std::string pn = AudioEngine::instance()->get_pretty_name_by_name (p[j]);
+               if (!pn.empty()) {
+                       n = pn;
+               }
+               b->add_channel (n, type);
                b->set_port (j, p[j]);
        }