diff options
Diffstat (limited to 'libs/ardour/session_state.cc')
| -rw-r--r-- | libs/ardour/session_state.cc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 4c7515f5e4..16cbfd1d36 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -164,7 +164,7 @@ Session::first_stage_init (string fullpath, string snapshot_name) _base_frame_rate = _current_frame_rate; _tempo_map = new TempoMap (_current_frame_rate); - scoped_connect (_tempo_map->StateChanged, boost::bind (&Session::tempo_map_changed, this, _1)); + _tempo_map->StateChanged.connect (*this, boost::bind (&Session::tempo_map_changed, this, _1)); _non_soloed_outs_muted = false; @@ -266,21 +266,21 @@ Session::first_stage_init (string fullpath, string snapshot_name) delta_accumulator_cnt = 0; _slave_state = Stopped; - scoped_connect (_engine.GraphReordered, boost::bind (&Session::graph_reordered, this)); + _engine.GraphReordered.connect (*this, boost::bind (&Session::graph_reordered, this)); /* These are all static "per-class" signals */ - scoped_connect (RegionFactory::CheckNewRegion, boost::bind (&Session::add_region, this, _1)); - scoped_connect (SourceFactory::SourceCreated, boost::bind (&Session::add_source, this, _1)); - scoped_connect (PlaylistFactory::PlaylistCreated, boost::bind (&Session::add_playlist, this, _1, _2)); - scoped_connect (Processor::ProcessorCreated, boost::bind (&Session::add_processor, this, _1)); - scoped_connect (NamedSelection::NamedSelectionCreated, boost::bind (&Session::add_named_selection, this, _1)); - scoped_connect (AutomationList::AutomationListCreated, boost::bind (&Session::add_automation_list, this, _1)); + RegionFactory::CheckNewRegion.connect (*this, boost::bind (&Session::add_region, this, _1)); + SourceFactory::SourceCreated.connect (*this, boost::bind (&Session::add_source, this, _1)); + PlaylistFactory::PlaylistCreated.connect (*this, boost::bind (&Session::add_playlist, this, _1, _2)); + Processor::ProcessorCreated.connect (*this, boost::bind (&Session::add_processor, this, _1)); + NamedSelection::NamedSelectionCreated.connect (*this, boost::bind (&Session::add_named_selection, this, _1)); + AutomationList::AutomationListCreated.connect (*this, boost::bind (&Session::add_automation_list, this, _1)); // BOOST SIGNALS - // scoped_connect (Controllable::Destroyed, boost::bind (&Session::remove_controllable, this, _1)); + // Controllable::Destroyed.connect (*this, boost::bind (&Session::remove_controllable, this, _1)); - scoped_connect (IO::PortCountChanged, boost::bind (&Session::ensure_buffers, this, _1)); + IO::PortCountChanged.connect (*this, boost::bind (&Session::ensure_buffers, this, _1)); /* stop IO objects from doing stuff until we're ready for them */ @@ -332,15 +332,15 @@ Session::second_stage_init (bool new_session) _state_of_the_state = StateOfTheState (_state_of_the_state|CannotSave|Loading); - scoped_connect (_locations.changed, boost::bind (&Session::locations_changed, this)); - scoped_connect (_locations.added, boost::bind (&Session::locations_added, this, _1)); + _locations.changed.connect (*this, boost::bind (&Session::locations_changed, this)); + _locations.added.connect (*this, boost::bind (&Session::locations_added, this, _1)); setup_click_sounds (0); setup_midi_control (); /* Pay attention ... */ - scoped_connect (_engine.Halted, boost::bind (&Session::engine_halted, this)); - scoped_connect (_engine.Xrun, boost::bind (&Session::xrun_recovery, this)); + _engine.Halted.connect (*this, boost::bind (&Session::engine_halted, this)); + _engine.Xrun.connect (*this, boost::bind (&Session::xrun_recovery, this)); try { when_engine_running(); |