remove MIDI Control input and output ports from session-level objects
This commit is contained in:
parent
75aaae9963
commit
007136cc23
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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));
|
||||
|
|
|
@ -651,18 +651,6 @@ Session::start_midi_thread ()
|
|||
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>
|
||||
Session::mmc_output_port () const
|
||||
{
|
||||
|
|
|
@ -78,8 +78,8 @@ GenericMidiControlProtocol::GenericMidiControlProtocol (Session& s)
|
|||
, _threshold (10)
|
||||
, gui (0)
|
||||
{
|
||||
_input_port = boost::dynamic_pointer_cast<AsyncMIDIPort> (s.midi_input_port ());
|
||||
_output_port = boost::dynamic_pointer_cast<AsyncMIDIPort> (s.midi_output_port ());
|
||||
// _input_port = boost::dynamic_pointer_cast<AsyncMIDIPort> (s.midi_input_port ());
|
||||
// _output_port = boost::dynamic_pointer_cast<AsyncMIDIPort> (s.midi_output_port ());
|
||||
|
||||
_input_bundle.reset (new ARDOUR::Bundle (_("Generic MIDI Control In"), true));
|
||||
_output_bundle.reset (new ARDOUR::Bundle (_("Generic MIDI Control Out"), false));
|
||||
|
|
Loading…
Reference in New Issue
Block a user