From 007136cc23f83cc454f8e96bd22e7ea9966ee0f0 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 30 Dec 2019 11:49:20 -0700 Subject: remove MIDI Control input and output ports from session-level objects --- libs/ardour/ardour/midiport_manager.h | 11 ----------- libs/ardour/ardour/session.h | 2 -- libs/ardour/midi_ui.cc | 5 ----- libs/ardour/midiport_manager.cc | 15 +-------------- libs/ardour/session_midi.cc | 12 ------------ 5 files changed, 1 insertion(+), 44 deletions(-) (limited to 'libs/ardour') 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 midi_input_port () const - { - return _midi_in; - } - boost::shared_ptr midi_output_port () const - { - return _midi_out; - } - boost::shared_ptr mmc_input_port () const { return boost::dynamic_pointer_cast (_mmc_in); @@ -104,8 +95,6 @@ public: protected: /* asynchronously handled ports: ARDOUR::AsyncMIDIPort */ - boost::shared_ptr _midi_in; - boost::shared_ptr _midi_out; boost::shared_ptr _mmc_in; boost::shared_ptr _mmc_out; boost::shared_ptr _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 midi_input_port () const; - boost::shared_ptr midi_output_port () const; boost::shared_ptr mmc_output_port () const; boost::shared_ptr mmc_input_port () const; boost::shared_ptr 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 > ports; boost::shared_ptr p; - if ((p = boost::dynamic_pointer_cast (_session.midi_input_port()))) { - ports.push_back (p); - } - - if ((p = boost::dynamic_pointer_cast (_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 @@ -651,18 +651,6 @@ Session::start_midi_thread () return 0; } -boost::shared_ptr -Session::midi_input_port () const -{ - return _midi_ports->midi_input_port (); -} - -boost::shared_ptr -Session::midi_output_port () const -{ - return _midi_ports->midi_output_port (); -} - boost::shared_ptr Session::mmc_output_port () const { -- cgit v1.2.3