diff options
author | Carl Hetherington <carl@carlh.net> | 2010-08-09 16:40:31 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2010-08-09 16:40:31 +0000 |
commit | 5b520324ceab2559723b4ef5127301fa61ff4846 (patch) | |
tree | 13850a356fabdcbd55ca527fc5faf2fda63cb209 /libs/ardour/session_state.cc | |
parent | aa9fd3334976ceae7e164c3fabc87e55fc921dff (diff) |
Allow markers to be glued to bar/beat time. Fixes #1815.
git-svn-id: svn://localhost/ardour2/branches/3.0@7573 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_state.cc')
-rw-r--r-- | libs/ardour/session_state.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 94ea4bb2a1..a2dc6ced68 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -325,8 +325,8 @@ Session::second_stage_init () _state_of_the_state = StateOfTheState (_state_of_the_state|CannotSave|Loading); - _locations.changed.connect_same_thread (*this, boost::bind (&Session::locations_changed, this)); - _locations.added.connect_same_thread (*this, boost::bind (&Session::locations_added, this, _1)); + _locations->changed.connect_same_thread (*this, boost::bind (&Session::locations_changed, this)); + _locations->added.connect_same_thread (*this, boost::bind (&Session::locations_added, this, _1)); setup_click_sounds (0); setup_midi_control (); @@ -1094,12 +1094,12 @@ Session::state(bool full_state) } if (full_state) { - node->add_child_nocopy (_locations.get_state()); + node->add_child_nocopy (_locations->get_state()); } else { // for a template, just create a new Locations, populate it // with the default start and end, and get the state for that. - Locations loc; - Location* range = new Location (0, 0, _("session"), Location::IsSessionRange); + Locations loc (*this); + Location* range = new Location (*this, 0, 0, _("session"), Location::IsSessionRange); range->set (max_frames, 0); loc.add (range); node->add_child_nocopy (loc.get_state()); @@ -1278,21 +1278,21 @@ Session::set_state (const XMLNode& node, int version) if ((child = find_named_node (node, "Locations")) == 0) { error << _("Session: XML state has no locations section") << endmsg; goto out; - } else if (_locations.set_state (*child, version)) { + } else if (_locations->set_state (*child, version)) { goto out; } Location* location; - if ((location = _locations.auto_loop_location()) != 0) { + if ((location = _locations->auto_loop_location()) != 0) { set_auto_loop_location (location); } - if ((location = _locations.auto_punch_location()) != 0) { + if ((location = _locations->auto_punch_location()) != 0) { set_auto_punch_location (location); } - if ((location = _locations.session_range_location()) != 0) { + if ((location = _locations->session_range_location()) != 0) { delete _session_range_location; _session_range_location = location; } @@ -3165,7 +3165,7 @@ Session::config_changed (std::string p, bool ours) Location* location; - if ((location = _locations.auto_punch_location()) != 0) { + if ((location = _locations->auto_punch_location()) != 0) { if (config.get_punch_in ()) { replace_event (SessionEvent::PunchIn, location->start()); @@ -3178,7 +3178,7 @@ Session::config_changed (std::string p, bool ours) Location* location; - if ((location = _locations.auto_punch_location()) != 0) { + if ((location = _locations->auto_punch_location()) != 0) { if (config.get_punch_out()) { replace_event (SessionEvent::PunchOut, location->end()); |