smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 08:14:58 +01:00
Code Issues Projects Releases Wiki Activity

remove MIDI Control input and output ports from session-level objects

Browse source
This commit is contained in:
Paul Davis 2019-12-30 11:49:20 -07:00
parent 75aaae9963
commit 007136cc23
6 changed files with 3 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libs/ardour/ardour/midiport_manager.h
View file

@ -54,15 +54,6 @@ public:
* callback. * 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 boost::shared_ptr<ARDOUR::Port> mmc_input_port () const
{ {
return boost::dynamic_pointer_cast<MidiPort> (_mmc_in); return boost::dynamic_pointer_cast<MidiPort> (_mmc_in);
@ -104,8 +95,6 @@ public:
protected: protected:
/* asynchronously handled ports: ARDOUR::AsyncMIDIPort */ /* 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_in;
boost::shared_ptr<Port> _mmc_out; boost::shared_ptr<Port> _mmc_out;
boost::shared_ptr<Port> _scene_in; boost::shared_ptr<Port> _scene_in;

2
libs/ardour/ardour/session.h
View file

@ -1198,8 +1198,6 @@ public:
/* asynchronous MIDI control ports */ /* 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_output_port () const;
boost::shared_ptr<Port> mmc_input_port () const; boost::shared_ptr<Port> mmc_input_port () const;
boost::shared_ptr<Port> scene_input_port () const; boost::shared_ptr<Port> scene_input_port () const;

5
libs/ardour/midi_ui.cc
View file

@ -119,11 +119,6 @@ MidiControlUI::reset_ports ()
vector<boost::shared_ptr<AsyncMIDIPort> > ports; vector<boost::shared_ptr<AsyncMIDIPort> > ports;
boost::shared_ptr<AsyncMIDIPort> p; 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()))) { if ((p = boost::dynamic_pointer_cast<AsyncMIDIPort> (_session.mmc_input_port()))) {
ports.push_back (p); ports.push_back (p);
} }

15
libs/ardour/midiport_manager.cc
View file

@ -38,12 +38,6 @@ MidiPortManager::MidiPortManager ()
MidiPortManager::~MidiPortManager () MidiPortManager::~MidiPortManager ()
{ {
Glib::Threads::Mutex::Lock em (AudioEngine::instance()->process_lock()); 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) { if (_scene_in) {
AudioEngine::instance()->unregister_port (_scene_in); AudioEngine::instance()->unregister_port (_scene_in);
} }
@ -64,13 +58,10 @@ MidiPortManager::create_ports ()
{ {
/* this method is idempotent */ /* this method is idempotent */
if (_midi_in) { if (_mmc_in) {
return; 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_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); _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 (_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_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_in->name(), _mmc_in));
ports.insert (make_pair (_mmc_out->name(), _mmc_out)); ports.insert (make_pair (_mmc_out->name(), _mmc_out));
ports.insert (make_pair (_vkbd_out->name(), _vkbd_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 (_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_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_in->name(), _mmc_in));
ports.insert (make_pair (_mmc_out->name(), _mmc_out)); ports.insert (make_pair (_mmc_out->name(), _mmc_out));
ports.insert (make_pair (_vkbd_out->name(), _vkbd_out)); ports.insert (make_pair (_vkbd_out->name(), _vkbd_out));

12
libs/ardour/session_midi.cc
View file

@ -651,18 +651,6 @@ Session::start_midi_thread ()
return 0; return 0;
} }
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> boost::shared_ptr<ARDOUR::Port>
Session::mmc_output_port () const Session::mmc_output_port () const
{ {

4
libs/surfaces/generic_midi/generic_midi_control_protocol.cc
View file

@ -78,8 +78,8 @@ GenericMidiControlProtocol::GenericMidiControlProtocol (Session& s)
, _threshold (10) , _threshold (10)
, gui (0) , gui (0)
{ {
_input_port = boost::dynamic_pointer_cast<AsyncMIDIPort> (s.midi_input_port ()); // _input_port = boost::dynamic_pointer_cast<AsyncMIDIPort> (s.midi_input_port ());
_output_port = boost::dynamic_pointer_cast<AsyncMIDIPort> (s.midi_output_port ()); // _output_port = boost::dynamic_pointer_cast<AsyncMIDIPort> (s.midi_output_port ());
_input_bundle.reset (new ARDOUR::Bundle (_("Generic MIDI Control In"), true)); _input_bundle.reset (new ARDOUR::Bundle (_("Generic MIDI Control In"), true));
_output_bundle.reset (new ARDOUR::Bundle (_("Generic MIDI Control Out"), false)); _output_bundle.reset (new ARDOUR::Bundle (_("Generic MIDI Control Out"), false));