diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-04-10 23:12:44 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-04-10 23:12:44 +0000 |
| commit | 474acbb9a925b035af8f2cb3df764121127c4496 (patch) | |
| tree | 7a09d7bb1674d3219ed43b8448b1110f3f956ddb | |
| parent | a157537898eccf08009281633b19970515366a78 (diff) | |
remove link against libusb from gtk_ardour; allow recording beyond current end marker (bug introduced recently)
git-svn-id: svn://localhost/trunk/ardour2@451 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/SConscript | 1 | ||||
| -rw-r--r-- | libs/ardour/session_transport.cc | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index 0ca9def5fe..38cac52b40 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -24,7 +24,6 @@ gtkardour.Append(POTFILE=domain + '.pot') gtkardour.Merge ([ libraries['ardour'], - libraries['usb'], libraries['gtkmm2ext'], # libraries['flowcanvas'], libraries['midi++2'], diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc index 2e12c58f65..bf8b236600 100644 --- a/libs/ardour/session_transport.cc +++ b/libs/ardour/session_transport.cc @@ -720,7 +720,7 @@ Session::set_transport_speed (float speed, bool abort) } else if (transport_stopped() && speed == 1.0) { - if (Config->get_stop_at_session_end() && _transport_frame >= current_end_frame()) { + if (!get_record_enabled() && Config->get_stop_at_session_end() && _transport_frame >= current_end_frame()) { return; } @@ -746,7 +746,7 @@ Session::set_transport_speed (float speed, bool abort) } else { - if (Config->get_stop_at_session_end() && _transport_frame >= current_end_frame()) { + if (!get_record_enabled() && Config->get_stop_at_session_end() && _transport_frame >= current_end_frame()) { return; } |