diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-10-25 19:46:23 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-10-25 19:46:23 +0000 |
| commit | 7b818e9a7f3d999eb6bcc90c961d2b42531c3917 (patch) | |
| tree | 603bf528cea93051837bedb514b3ed74ee61a4fa /libs/ardour/ardour | |
| parent | edc8a593556df099622539763b3189b2f9ab1322 (diff) | |
move ownership of LTC I/O ports to Session, and manage as IO objects
git-svn-id: svn://localhost/ardour2/branches/3.0@13341 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/audioengine.h | 7 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index a908cf0bc1..165ad6744f 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -260,9 +260,6 @@ _ the regular process() call to session->process() is not made. int create_process_thread (boost::function<void()>, pthread_t*, size_t stacksize); - boost::shared_ptr<Port> ltc_input_port() const { return _ltc_input; } - boost::shared_ptr<Port> ltc_output_port() const { return _ltc_output; } - private: static AudioEngine* _instance; @@ -292,10 +289,6 @@ private: Glib::Threads::Thread* m_meter_thread; ProcessThread* _main_thread; - boost::shared_ptr<Port> _ltc_input; - boost::shared_ptr<Port> _ltc_output; - void reconnect_ltc (); - SerializedRCUManager<Ports> ports; boost::shared_ptr<Port> register_port (DataType type, const std::string& portname, bool input); diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 2f9c114c0c..e3376ae45f 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -847,6 +847,9 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi /** Emitted when the session wants Ardour to quit */ static PBD::Signal0<void> Quit; + boost::shared_ptr<Port> ltc_input_port() const; + boost::shared_ptr<Port> ltc_output_port() const; + protected: friend class AudioEngine; void set_block_size (pframes_t nframes); @@ -1554,6 +1557,12 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi bool ignore_route_processor_changes; MidiClockTicker* midi_clock; + + boost::shared_ptr<IO> _ltc_input; + boost::shared_ptr<IO> _ltc_output; + + void reconnect_ltc_input (); + void reconnect_ltc_output (); }; } // namespace ARDOUR |