add left/right side trim cursors and use them for region trimming, as appropriate

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

diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc
index 167d936f500f6f379127f96d8c713e04b057f5b3..c913a5cb64725714b42cdc7a1789c0a5aa5723d9 100644 (file)
--- a/libs/ardour/session_time.cc
+++ b/libs/ardour/session_time.cc
@@ -147,8 +147,9 @@ Session::timecode_drop_frames() const
 
                        break;
                default:
-                       cerr << "Editor received unexpected timecode type" << endl;
+                       error << "Editor received unexpected timecode type" << endmsg;
        }
+
        return false;
 }
 void
@@ -452,7 +453,7 @@ Session::jack_sync_callback (jack_transport_state_t state,
 
        switch (state) {
        case JackTransportStopped:
-               if (slave && _transport_frame != pos->frame && post_transport_work == 0) {
+               if (slave && _transport_frame != pos->frame && post_transport_work() == 0) {
                        request_locate (pos->frame, false);
                        // cerr << "SYNC: stopped, locate to " << pos->frame << " from " << _transport_frame << endl;
                        return false;
@@ -461,9 +462,9 @@ Session::jack_sync_callback (jack_transport_state_t state,
                }
 
        case JackTransportStarting:
-               // cerr << "SYNC: starting @ " << pos->frame << " a@ " << _transport_frame << " our work = " <<  post_transport_work << " pos matches ? " << (_transport_frame == pos->frame) << endl;
+               // cerr << "SYNC: starting @ " << pos->frame << " a@ " << _transport_frame << " our work = " <<  post_transport_work() << " pos matches ? " << (_transport_frame == pos->frame) << endl;
                if (slave) {
-                       return _transport_frame == pos->frame && post_transport_work == 0;
+                       return _transport_frame == pos->frame && post_transport_work() == 0;
                } else {
                        return true;
                }
@@ -501,7 +502,7 @@ Session::jack_timebase_callback (jack_transport_state_t /*state*/,
 
        if (_tempo_map) {
 
-               TempoMap::Metric metric (_tempo_map->metric_at (_transport_frame));
+               TempoMetric metric (_tempo_map->metric_at (_transport_frame));
                _tempo_map->bbt_time_with_metric (_transport_frame, bbt, metric);
 
                pos->bar = bbt.bars;