diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-11-02 05:38:41 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-11-02 05:38:41 +0000 |
| commit | 7eba21ca19897c7e7c89d676527d774dd2d95721 (patch) | |
| tree | 21981e4b210958c1201179bd836d59661e9af950 /libs/ardour | |
| parent | 40a6f878a945d96e51839d036992521dd5883e05 (diff) | |
remove broken loop button behaviour, and don't remove start+end markers when "clearing" the locations list
git-svn-id: svn://localhost/ardour2/trunk@1058 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/ardour/configuration_vars.h | 1 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 3 | ||||
| -rw-r--r-- | libs/ardour/location.cc | 10 |
3 files changed, 9 insertions, 5 deletions
diff --git a/libs/ardour/ardour/configuration_vars.h b/libs/ardour/ardour/configuration_vars.h index fe65e9d433..8044190066 100644 --- a/libs/ardour/ardour/configuration_vars.h +++ b/libs/ardour/ardour/configuration_vars.h @@ -80,7 +80,6 @@ CONFIG_VARIABLE (std::string, click_emphasis_sound, "click-emphasis-sound", "") CONFIG_VARIABLE (bool, auto_play, "auto-play", false) CONFIG_VARIABLE (bool, auto_return, "auto-return", false) CONFIG_VARIABLE (bool, auto_input, "auto-input", true) -CONFIG_VARIABLE (bool, auto_loop, "auto-loop", false) CONFIG_VARIABLE (bool, punch_in, "punch-in", false) CONFIG_VARIABLE (bool, punch_out, "punch-out", false) CONFIG_VARIABLE (bool, plugins_stop_with_transport, "plugins-stop-with-transport", false) diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index cdc79164e6..c3f2dc30bf 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -346,7 +346,10 @@ class Session : public PBD::StatefulDestructible void request_bounded_roll (nframes_t start, nframes_t end); void request_stop (bool abort = false); void request_locate (nframes_t frame, bool with_roll = false); + void request_play_loop (bool yn); + bool get_play_loop () const { return play_loop; } + nframes_t last_transport_start() const { return _last_roll_location; } void goto_end () { request_locate (end_location->start(), false);} void goto_start () { request_locate (start_location->start(), false); } diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc index b46972ef2e..e09a59d42f 100644 --- a/libs/ardour/location.cc +++ b/libs/ardour/location.cc @@ -420,17 +420,19 @@ Locations::clear () { { Glib::Mutex::Lock lm (lock); - LocationList::iterator tmp; + for (LocationList::iterator i = locations.begin(); i != locations.end(); ) { - tmp = i; + + LocationList::iterator tmp = i; ++tmp; + if (!(*i)->is_end() && !(*i)->is_start()) { locations.erase (i); } + i = tmp; } - locations.clear (); current_location = 0; } @@ -579,7 +581,7 @@ Locations::set_state (const XMLNode& node) nlist = node.children(); - locations.clear (); // dangerous + locations.clear (); current_location = 0; { |