summaryrefslogtreecommitdiff
path: root/libs/ardour
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2019-12-30 11:49:20 -0700
committerPaul Davis <paul@linuxaudiosystems.com>2019-12-31 12:06:14 -0700
commit007136cc23f83cc454f8e96bd22e7ea9966ee0f0 (patch)
tree25ce641e69dc83003b2c1b7390aadf9c30a6869b /libs/ardour
parent75aaae9963a32735b29a21658ddc55d5da4722d1 (diff)
remove MIDI Control input and output ports from session-level objects
Diffstat (limited to 'libs/ardour')
-rw-r--r--libs/ardour/ardour/midiport_manager.h11
-rw-r--r--libs/ardour/ardour/session.h2
-rw-r--r--libs/ardour/midi_ui.cc5
-rw-r--r--libs/ardour/midiport_manager.cc15
-rw-r--r--libs/ardour/session_midi.cc12
5 files changed, 1 insertions, 44 deletions
diff --git a/libs/ardour/ardour/midiport_manager.h b/libs/ardour/ardour/midiport_manager.h
index c268974236..6dd55f998d 100644
--- a/libs/ardour/ardour/midiport_manager.h
+++ b/libs/ardour/ardour/midiport_manager.h
@@ -54,15 +54,6 @@ public:
* callback.
*/
- boost::shared_ptr<ARDOUR::Port> midi_input_port () const
- {
- return _midi_in;
- }
- boost::shared_ptr<ARDOUR::Port> midi_output_port () const
- {
- return _midi_out;
- }
-
boost::shared_ptr<ARDOUR::Port> mmc_input_port () const
{
return boost::dynamic_pointer_cast<MidiPort> (_mmc_in);
@@ -104,8 +95,6 @@ public:
protected:
/* asynchronously handled ports: ARDOUR::AsyncMIDIPort */
- boost::shared_ptr<Port> _midi_in;
- boost::shared_ptr<Port> _midi_out;
boost::shared_ptr<Port> _mmc_in;
boost::shared_ptr<Port> _mmc_out;
boost::shared_ptr<Port> _scene_in;
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 6ba15929d5..17b7c9ca55 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -1198,8 +1198,6 @@ public:
/* asynchronous MIDI control ports */
- boost::shared_ptr<Port> midi_input_port () const;
- boost::shared_ptr<Port> midi_output_port () const;
boost::shared_ptr<Port> mmc_output_port () const;
boost::shared_ptr<Port> mmc_input_port () const;
boost::shared_ptr<Port> scene_input_port () const;
diff --git a/libs/ardour/midi_ui.cc b/libs/ardour/midi_ui.cc
index c2f424e387..83a2a91946 100644
--- a/libs/ardour/midi_ui.cc
+++ b/libs/ardour/midi_ui.cc
@@ -119,11 +119,6 @@ MidiControlUI::reset_ports ()
vector<boost::shared_ptr<AsyncMIDIPort> > ports;
boost::shared_ptr<AsyncMIDIPort> p;
- if ((p = boost::dynamic_pointer_cast<AsyncMIDIPort> (_session.midi_input_port()))) {
- ports.push_back (p);
- }
-
-
if ((p = boost::dynamic_pointer_cast<AsyncMIDIPort> (_session.mmc_input_port()))) {
ports.push_back (p);
}
diff --git a/libs/ardour/midiport_manager.cc b/libs/ardour/midiport_manager.cc
index 0104dc2915..0b52463099 100644
--- a/libs/ardour/midiport_manager.cc
+++ b/libs/ardour/midiport_manager.cc
@@ -38,12 +38,6 @@ MidiPortManager::MidiPortManager ()
MidiPortManager::~MidiPortManager ()
{
Glib::Threads::Mutex::Lock em (AudioEngine::instance()->process_lock());
- if (_midi_in) {
- AudioEngine::instance()->unregister_port (_midi_in);
- }
- if (_midi_out) {
- AudioEngine::instance()->unregister_port (_midi_out);
- }
if (_scene_in) {
AudioEngine::instance()->unregister_port (_scene_in);
}
@@ -64,13 +58,10 @@ MidiPortManager::create_ports ()
{
/* this method is idempotent */
- if (_midi_in) {
+ if (_mmc_in) {
return;
}
- _midi_in = AudioEngine::instance()->register_input_port (DataType::MIDI, X_("MIDI control in"), true);
- _midi_out = AudioEngine::instance()->register_output_port (DataType::MIDI, X_("MIDI control out"), true);
-
_mmc_in = AudioEngine::instance()->register_input_port (DataType::MIDI, X_("MMC in"), true);
_mmc_out = AudioEngine::instance()->register_output_port (DataType::MIDI, X_("MMC out"), true);
@@ -101,8 +92,6 @@ MidiPortManager::set_midi_port_states (const XMLNodeList&nodes)
ports.insert (make_pair (_mtc_output_port->name(), _mtc_output_port));
ports.insert (make_pair (_midi_clock_output_port->name(), _midi_clock_output_port));
- ports.insert (make_pair (_midi_in->name(), _midi_in));
- ports.insert (make_pair (_midi_out->name(), _midi_out));
ports.insert (make_pair (_mmc_in->name(), _mmc_in));
ports.insert (make_pair (_mmc_out->name(), _mmc_out));
ports.insert (make_pair (_vkbd_out->name(), _vkbd_out));
@@ -132,8 +121,6 @@ MidiPortManager::get_midi_port_states () const
ports.insert (make_pair (_mtc_output_port->name(), _mtc_output_port));
ports.insert (make_pair (_midi_clock_output_port->name(), _midi_clock_output_port));
- ports.insert (make_pair (_midi_in->name(), _midi_in));
- ports.insert (make_pair (_midi_out->name(), _midi_out));
ports.insert (make_pair (_mmc_in->name(), _mmc_in));
ports.insert (make_pair (_mmc_out->name(), _mmc_out));
ports.insert (make_pair (_vkbd_out->name(), _vkbd_out));
diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc
index adbf8aefaf..3048303c7d 100644
--- a/libs/ardour/session_midi.cc
+++ b/libs/ardour/session_midi.cc
@@ -652,18 +652,6 @@ Session::start_midi_thread ()
}
boost::shared_ptr<ARDOUR::Port>
-Session::midi_input_port () const
-{
- return _midi_ports->midi_input_port ();
-}
-
-boost::shared_ptr<ARDOUR::Port>
-Session::midi_output_port () const
-{
- return _midi_ports->midi_output_port ();
-}
-
-boost::shared_ptr<ARDOUR::Port>
Session::mmc_output_port () const
{
return _midi_ports->mmc_output_port ();