diff options
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/midi_scene_changer.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/midi_ui.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/midiport_manager.h | 27 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 27 |
4 files changed, 23 insertions, 37 deletions
diff --git a/libs/ardour/ardour/midi_scene_changer.h b/libs/ardour/ardour/midi_scene_changer.h index 6eff899b8e..792f4fb74f 100644 --- a/libs/ardour/ardour/midi_scene_changer.h +++ b/libs/ardour/ardour/midi_scene_changer.h @@ -36,7 +36,7 @@ class MIDISceneChanger : public SceneChanger ~MIDISceneChanger (); void run (framepos_t start, framepos_t end); - void set_input_port (MIDI::Port*); + void set_input_port (boost::shared_ptr<MidiPort>); void set_output_port (boost::shared_ptr<MidiPort>); uint8_t bank_at (framepos_t, uint8_t channel); @@ -56,7 +56,7 @@ class MIDISceneChanger : public SceneChanger private: typedef std::multimap<framepos_t,boost::shared_ptr<MIDISceneChange> > Scenes; - MIDI::Port* input_port; + boost::shared_ptr<MidiPort> input_port; boost::shared_ptr<MidiPort> output_port; Glib::Threads::RWLock scene_lock; Scenes scenes; diff --git a/libs/ardour/ardour/midi_ui.h b/libs/ardour/ardour/midi_ui.h index 2df5ea020d..7f57f22e24 100644 --- a/libs/ardour/ardour/midi_ui.h +++ b/libs/ardour/ardour/midi_ui.h @@ -61,7 +61,7 @@ class LIBARDOUR_API MidiControlUI : public AbstractUI<MidiUIRequest> private: ARDOUR::Session& _session; - bool midi_input_handler (Glib::IOCondition, AsyncMIDIPort*); + bool midi_input_handler (Glib::IOCondition, boost::shared_ptr<AsyncMIDIPort>); void reset_ports (); void clear_ports (); diff --git a/libs/ardour/ardour/midiport_manager.h b/libs/ardour/ardour/midiport_manager.h index 4e0f98cb3c..2fb5d5a57a 100644 --- a/libs/ardour/ardour/midiport_manager.h +++ b/libs/ardour/ardour/midiport_manager.h @@ -53,18 +53,14 @@ class LIBARDOUR_API MidiPortManager { * callback. */ - MIDI::Port* midi_input_port () const { return _midi_input_port; } - MIDI::Port* midi_output_port () const { return _midi_output_port; } - MIDI::Port* mmc_input_port () const { return _mmc_input_port; } - MIDI::Port* mmc_output_port () const { return _mmc_output_port; } - MIDI::Port* scene_input_port () const { return _scene_input_port; } - MIDI::Port* scene_output_port () const { return _scene_output_port; } + 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<MidiPort> mmc_in() const { return boost::dynamic_pointer_cast<MidiPort>(_mmc_in); } - boost::shared_ptr<MidiPort> mmc_out() const { return boost::dynamic_pointer_cast<MidiPort>(_mmc_out); } + boost::shared_ptr<ARDOUR::Port> mmc_input_port() const { return boost::dynamic_pointer_cast<MidiPort>(_mmc_in); } + boost::shared_ptr<ARDOUR::Port> mmc_output_port() const { return boost::dynamic_pointer_cast<MidiPort>(_mmc_out); } - boost::shared_ptr<MidiPort> scene_in() const { return boost::dynamic_pointer_cast<MidiPort>(_scene_in); } - boost::shared_ptr<MidiPort> scene_out() const { return boost::dynamic_pointer_cast<MidiPort>(_scene_out); } + boost::shared_ptr<ARDOUR::Port> scene_input_port() const { return boost::dynamic_pointer_cast<MidiPort>(_scene_in); } + boost::shared_ptr<ARDOUR::Port> scene_output_port() const { return boost::dynamic_pointer_cast<MidiPort>(_scene_out); } /* Ports used for synchronization. These have their I/O handled inside the * process callback. @@ -81,16 +77,7 @@ class LIBARDOUR_API MidiPortManager { PBD::Signal0<void> PortsChanged; protected: - /* asynchronously handled ports: MIDI::Port */ - MIDI::Port* _midi_input_port; - MIDI::Port* _midi_output_port; - MIDI::Port* _mmc_input_port; - MIDI::Port* _mmc_output_port; - MIDI::Port* _scene_input_port; - MIDI::Port* _scene_output_port; - /* these point to the same objects as the members above, - but cast to their ARDOUR::Port base class - */ + /* asynchronously handled ports: ARDOUR::AsyncMIDIPort */ boost::shared_ptr<Port> _midi_in; boost::shared_ptr<Port> _midi_out; boost::shared_ptr<Port> _mmc_in; diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 60fa9e5761..3d6f05758e 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -1009,27 +1009,26 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop SceneChanger* scene_changer() const { return _scene_changer; } - boost::shared_ptr<Port> ltc_input_port() const; - boost::shared_ptr<Port> ltc_output_port() const; - - boost::shared_ptr<IO> ltc_input_io() { return _ltc_input; } - boost::shared_ptr<IO> ltc_output_io() { return _ltc_output; } - - MIDI::Port* midi_input_port () const; - MIDI::Port* midi_output_port () const; - MIDI::Port* mmc_output_port () const; - MIDI::Port* mmc_input_port () const; + /* asynchronous MIDI control ports */ - MIDI::Port* scene_input_port () const; - MIDI::Port* scene_output_port () const; + 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; + boost::shared_ptr<Port> scene_output_port () const; - boost::shared_ptr<MidiPort> scene_in () const; - boost::shared_ptr<MidiPort> scene_out () const; + /* synchronous MIDI ports used for synchronization */ boost::shared_ptr<MidiPort> midi_clock_output_port () const; boost::shared_ptr<MidiPort> midi_clock_input_port () const; boost::shared_ptr<MidiPort> mtc_output_port () const; boost::shared_ptr<MidiPort> mtc_input_port () const; + boost::shared_ptr<Port> ltc_input_port() const; + boost::shared_ptr<Port> ltc_output_port() const; + + boost::shared_ptr<IO> ltc_input_io() { return _ltc_input; } + boost::shared_ptr<IO> ltc_output_io() { return _ltc_output; } MIDI::MachineControl& mmc() { return *_mmc; } |