Remove unused method.

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

diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 8d885d686f49a478e5cbff4550466a00beca11cb..d0e927dbab7fba81ee6fff9247937cc6aee6718d 100644 (file)
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -123,7 +123,7 @@ Session::request_stop (bool abort, bool clear_state)
 }
 
 void
-Session::request_locate (nframes_t target_frame, bool with_roll)
+Session::request_locate (framepos_t target_frame, bool with_roll)
 {
        SessionEvent *ev = new SessionEvent (with_roll ? SessionEvent::LocateRoll : SessionEvent::Locate, SessionEvent::Add, SessionEvent::Immediate, target_frame, 0, false);
        DEBUG_TRACE (DEBUG::Transport, string_compose ("Request locate to %1\n", target_frame));
@@ -131,7 +131,7 @@ Session::request_locate (nframes_t target_frame, bool with_roll)
 }
 
 void
-Session::force_locate (nframes64_t target_frame, bool with_roll)
+Session::force_locate (framepos_t target_frame, bool with_roll)
 {
        SessionEvent *ev = new SessionEvent (with_roll ? SessionEvent::LocateRoll : SessionEvent::Locate, SessionEvent::Add, SessionEvent::Immediate, target_frame, 0, true);
        DEBUG_TRACE (DEBUG::Transport, string_compose ("Request forced locate to %1\n", target_frame));
@@ -188,6 +188,14 @@ Session::realtime_stop (bool abort, bool clear_state)
                todo = PostTransportWork (todo | PostTransportStop);
        }
 
+       /* call routes */
+
+       boost::shared_ptr<RouteList> r = routes.reader ();
+
+       for (RouteList::iterator i = r->begin (); i != r->end(); ++i) {
+               (*i)->realtime_handle_transport_stopped ();
+       }
+
        if (actively_recording()) {
 
                /* move the transport position back to where the
@@ -593,9 +601,7 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
                play_loop = false;
        }
 
-       // can't cast away volatile so copy and emit that
-       nframes64_t tframe = _transport_frame;
-       PositionChanged (tframe); /* EMIT SIGNAL */
+       PositionChanged (_transport_frame); /* EMIT SIGNAL */
        TransportStateChange (); /* EMIT SIGNAL */
 
        /* and start it up again if relevant */
@@ -724,12 +730,12 @@ Session::flush_all_inserts ()
 }
 
 void
-Session::start_locate (nframes64_t target_frame, bool with_roll, bool with_flush, bool with_loop, bool force)
+Session::start_locate (framepos_t target_frame, bool with_roll, bool with_flush, bool with_loop, bool force)
 {
        if (synced_to_jack()) {
 
                double sp;
-               nframes64_t pos;
+               framepos_t pos;
 
                _slave->speed_and_position (sp, pos);
 
@@ -753,7 +759,7 @@ Session::start_locate (nframes64_t target_frame, bool with_roll, bool with_flush
 }
 
 int
-Session::micro_locate (nframes_t distance)
+Session::micro_locate (framecnt_t distance)
 {
        boost::shared_ptr<RouteList> rl = routes.reader();
        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
@@ -776,7 +782,7 @@ Session::micro_locate (nframes_t distance)
 
 /** @param with_mmc true to send a MMC locate command when the locate is done */
 void
-Session::locate (nframes64_t target_frame, bool with_roll, bool with_flush, bool with_loop, bool force, bool with_mmc)
+Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool with_loop, bool force, bool with_mmc)
 {
        if (actively_recording() && !with_loop) {
                return;
@@ -1135,6 +1141,7 @@ Session::start_transport ()
                if (tr) {
                        tr->realtime_set_speed (tr->speed(), true);
                }
+                (*i)->automation_snapshot (_transport_frame, true);
        }
 
        Timecode::Time time;
@@ -1183,7 +1190,7 @@ Session::post_transport ()
 }
 
 void
-Session::reset_rf_scale (nframes_t motion)
+Session::reset_rf_scale (framecnt_t motion)
 {
        cumulative_rf_motion += motion;
 
@@ -1280,6 +1287,10 @@ Session::switch_to_sync_source (SyncSource src)
                        return;
                }
 
+                if (config.get_video_pullup() != 0.0f) {
+                        return;
+                }
+
                new_slave = new JACK_Slave (_engine.jack());
                break;
                
@@ -1356,7 +1367,7 @@ Session::set_play_range (list<AudioRange>& range, bool leave_rolling)
                        /* locating/stopping is subject to delays for declicking.
                         */
                        
-                       nframes_t requested_frame = (*i).end;
+                       framepos_t requested_frame = i->end;
                        
                        if (requested_frame > current_block_size) {
                                requested_frame -= current_block_size;
@@ -1395,7 +1406,7 @@ Session::set_play_range (list<AudioRange>& range, bool leave_rolling)
 }
 
 void
-Session::request_bounded_roll (nframes_t start, nframes_t end)
+Session::request_bounded_roll (framepos_t start, framepos_t end)
 {
        AudioRange ar (start, end, 0);
        list<AudioRange> lar;
@@ -1404,7 +1415,7 @@ Session::request_bounded_roll (nframes_t start, nframes_t end)
        request_play_range (&lar, true);
 }
 void
-Session::request_roll_at_and_return (nframes_t start, nframes_t return_to)
+Session::request_roll_at_and_return (framepos_t start, framepos_t return_to)
 {
        SessionEvent *ev = new SessionEvent (SessionEvent::LocateRollLocate, SessionEvent::Add, SessionEvent::Immediate, return_to, 1.0);
        ev->target2_frame = start;
@@ -1438,9 +1449,7 @@ Session::engine_halted ()
 void
 Session::xrun_recovery ()
 {
-       // can't cast away volatile so copy and emit that
-       nframes64_t tframe = _transport_frame;
-       Xrun (tframe); //EMIT SIGNAL
+       Xrun (_transport_frame); //EMIT SIGNAL
 
        if (Config->get_stop_recording_on_xrun() && actively_recording()) {
 
@@ -1486,11 +1495,11 @@ Session::update_latency_compensation (bool with_stop, bool abort)
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
 
                if (with_stop) {
-                       (*i)->handle_transport_stopped (abort, (ptw & PostTransportLocate), (!(ptw & PostTransportLocate) || pending_locate_flush));
+                       (*i)->nonrealtime_handle_transport_stopped (abort, (ptw & PostTransportLocate), (!(ptw & PostTransportLocate) || pending_locate_flush));
                }
 
-               nframes_t old_latency = (*i)->output()->signal_latency ();
-               nframes_t track_latency = (*i)->update_total_latency ();
+               framecnt_t old_latency = (*i)->output()->signal_latency ();
+               framecnt_t track_latency = (*i)->update_total_latency ();
 
                if (old_latency != track_latency) {
                        (*i)->input()->update_port_total_latencies ();
@@ -1546,7 +1555,7 @@ Session::reset_jack_connection (jack_client_t* jack)
 }
 
 bool
-Session::maybe_stop (nframes_t limit)
+Session::maybe_stop (framepos_t limit)
 {
        if ((_transport_speed > 0.0f && _transport_frame >= limit) || (_transport_speed < 0.0f && _transport_frame == 0)) {
                if (synced_to_jack () && config.get_jack_time_master ()) {
@@ -1560,7 +1569,7 @@ Session::maybe_stop (nframes_t limit)
 }
 
 void
-Session::send_mmc_locate (nframes64_t t)
+Session::send_mmc_locate (framepos_t t)
 {
        Timecode::Time time;
        timecode_time_subframes (t, time);