undo the hiding of SR-dependent LV2 ports

[ardour.git] / libs / ardour / session_transport.cc

diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 693074cf9ae3985b09537fa4da07b3bed60e2250..51d8d2c369f57fb2131bf4c3960ba85c75412a16 100644 (file)
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -204,6 +204,7 @@ Session::realtime_stop (bool abort, bool clear_state)
 
        if (_transport_speed < 0.0f) {
                todo = (PostTransportWork (todo | PostTransportStop | PostTransportReverse));
+               _default_transport_speed = 1.0;
        } else {
                todo = PostTransportWork (todo | PostTransportStop);
        }
@@ -383,6 +384,7 @@ Session::butler_transport_work ()
        g_atomic_int_dec_and_test (&_butler->should_do_transport_work);
 
        DEBUG_TRACE (DEBUG::Transport, X_("Butler transport work all done\n"));
+       DEBUG_TRACE (DEBUG::Transport, X_(string_compose ("Frame %1\n", _transport_frame)));
 }
 
 void
@@ -490,7 +492,7 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
        boost::shared_ptr<RouteList> r = routes.reader ();
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               if (!(*i)->is_hidden()) {
+               if (!(*i)->is_auditioner()) {
                        (*i)->set_pending_declick (0);
                }
        }
@@ -851,7 +853,6 @@ Session::micro_locate (framecnt_t distance)
        }
 
        _transport_frame += distance;
-       _transport_frame = std::max((ARDOUR::framepos_t) 0, _transport_frame);
        return 0;
 }
 
@@ -897,7 +898,6 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool
 
        // Update Timecode time
        // [DR] FIXME: find out exactly where this should go below
-       target_frame = std::max((ARDOUR::framepos_t) 0, target_frame);
        _transport_frame = target_frame;
        _last_roll_or_reversal_location = target_frame;
        timecode_time(_transport_frame, transmitting_timecode_time);
@@ -1008,6 +1008,7 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool
                send_mmc_locate (_transport_frame);
        }
 
+       _last_roll_location = _last_roll_or_reversal_location =  _transport_frame;
        Located (); /* EMIT SIGNAL */
 }