diff options
author | Robin Gareus <robin@gareus.org> | 2019-03-01 16:45:42 +0100 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2019-03-01 16:45:42 +0100 |
commit | 1854a72b804fe011f8fd019a6003e024c0c95bdb (patch) | |
tree | f1b2dd9f93c3fd48c9bbd35d68e966ee1f4a19cb /libs/ardour/ardour/session.h | |
parent | 6064c75fd5b17a1a8483c040964b81885e38ac8d (diff) |
Revert Monitor-Section to be per session
This partially reverts 639dff3a7c7. When loading a session,
the monitor-bus that was saved with the session is used.
This changes semantics of the monitor-section/config.
Config::set_use_monitor_bus(bool) is used to initiate a change!
Notification about the change is sent asynchronously by
Session::MonitorBusAddedOrRemoved
It is no longer possible to directly call add/remove_monitor_section()
and leave the session + config in an inconsistent state.
Diffstat (limited to 'libs/ardour/ardour/session.h')
-rw-r--r-- | libs/ardour/ardour/session.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 539b6595c2..560ccbf2c4 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -873,15 +873,14 @@ public: PBD::Signal0<void> MuteChanged; PBD::Signal0<void> IsolatedChanged; PBD::Signal0<void> MonitorChanged; + PBD::Signal0<void> MonitorBusAddedOrRemoved; PBD::Signal0<void> session_routes_reconnected; /* monitor/master out */ int add_master_bus (ChanCount const&); - void add_monitor_section (); void reset_monitor_section (); - void remove_monitor_section (); bool monitor_active() const { return (_monitor_out && _monitor_out->monitor_control () && _monitor_out->monitor_control ()->monitor_active()); } boost::shared_ptr<Route> monitor_out() const { return _monitor_out; } @@ -1276,6 +1275,9 @@ private: std::string _missing_file_replacement; + void add_monitor_section (); + void remove_monitor_section (); + void initialize_latencies (); void update_latency (bool playback); bool update_route_latency (bool reverse, bool apply_to_delayline); |