move timecode-is-clock-synced option to global configuration parameters, not per...

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

diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index c002cc90084b6ea7ffed1df0710e0bfea3e24822..0cba1e807cd7ad9c76d89df4c1ff3addefcf597f 100644 (file)
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -25,22 +25,20 @@
 #include "pbd/error.h"
 #include "pbd/enumwriter.h"
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
-#include "ardour/ardour.h"
 #include "ardour/audioengine.h"
 #include "ardour/auditioner.h"
 #include "ardour/butler.h"
+#include "ardour/cycle_timer.h"
 #include "ardour/debug.h"
+#include "ardour/graph.h"
+#include "ardour/port.h"
 #include "ardour/process_thread.h"
 #include "ardour/session.h"
 #include "ardour/slave.h"
-#include "ardour/timestamps.h"
-#include "ardour/graph.h"
-#include "ardour/audio_port.h"
-#include "ardour/tempo.h"
 #include "ardour/ticker.h"
-#include "ardour/cycle_timer.h"
+#include "ardour/types.h"
 
 #include "midi++/manager.h"
 #include "midi++/mmc.h"
@@ -111,7 +109,7 @@ Session::no_roll (pframes_t nframes)
        
        framepos_t end_frame = _transport_frame + nframes; // FIXME: varispeed + no_roll ??
        int ret = 0;
-       bool declick = get_transport_declick_required();
+       int declick = get_transport_declick_required();
        boost::shared_ptr<RouteList> r = routes.reader ();
 
        if (_click_io) {
@@ -160,7 +158,7 @@ Session::process_routes (pframes_t nframes, bool& need_butler)
 
        const framepos_t start_frame = _transport_frame;
        const framepos_t end_frame = _transport_frame + floor (nframes * _transport_speed);
-
+       
        if (_process_graph) {
                DEBUG_TRACE(DEBUG::ProcessThreads,"calling graph/process-routes\n");
                _process_graph->process_routes (nframes, start_frame, end_frame, declick, need_butler);
@@ -515,7 +513,7 @@ Session::follow_slave (pframes_t nframes)
                slave_speed = 0.0f;
        }
 
-       if (_slave->is_always_synced() || config.get_timecode_source_is_synced()) {
+       if (_slave->is_always_synced() || Config->get_timecode_source_is_synced()) {
 
                /* if the TC source is synced, then we assume that its
                   speed is binary: 0.0 or 1.0
@@ -543,7 +541,7 @@ Session::follow_slave (pframes_t nframes)
                                                   _slave_state, slave_transport_frame, slave_speed, this_delta, average_slave_delta));
 
 
-       if (_slave_state == Running && !_slave->is_always_synced() && !config.get_timecode_source_is_synced()) {
+       if (_slave_state == Running && !_slave->is_always_synced() && !Config->get_timecode_source_is_synced()) {
 
                if (_transport_speed != 0.0f) {
 
@@ -585,7 +583,7 @@ Session::follow_slave (pframes_t nframes)
                        }
 
 #if 1
-                       if ((framecnt_t) abs(average_slave_delta) > _slave->resolution()) {
+                       if (!actively_recording() && (framecnt_t) abs(average_slave_delta) > _slave->resolution()) {
                                cerr << "average slave delta greater than slave resolution (" << _slave->resolution() << "), going to silent motion\n";
                                goto silent_motion;
                        }
@@ -1017,18 +1015,32 @@ Session::process_event (SessionEvent* ev)
 
        case SessionEvent::AutoLoop:
                if (play_loop) {
+                       /* roll after locate, do not flush, set "with loop"
+                          true only if we are seamless looping
+                       */
                        start_locate (ev->target_frame, true, false, Config->get_seamless_loop());
                }
                remove = false;
                del = false;
                break;
 
+       case SessionEvent::AutoLoopDeclick:
+               if (play_loop) {
+                       /* Request a declick fade-out and a fade-in; the fade-out will happen
+                          at the end of the loop, and the fade-in at the start.
+                       */
+                       transport_sub_state |= (PendingLoopDeclickOut | PendingLoopDeclickIn);
+               }
+               remove = false;
+               del = false;
+               break;
+
        case SessionEvent::Locate:
                if (ev->yes_or_no) {
-                       // cerr << "forced locate to " << ev->target_frame << endl;
+                       /* args: do not roll after locate, do flush, not with loop */
                        locate (ev->target_frame, false, true, false);
                } else {
-                       // cerr << "soft locate to " << ev->target_frame << endl;
+                       /* args: do not roll after locate, do flush, not with loop */
                        start_locate (ev->target_frame, false, true, false);
                }
                _send_timecode_update = true;
@@ -1036,10 +1048,10 @@ Session::process_event (SessionEvent* ev)
 
        case SessionEvent::LocateRoll:
                if (ev->yes_or_no) {
-                       // cerr << "forced locate to+roll " << ev->target_frame << endl;
+                       /* args: roll after locate, do flush, not with loop */
                        locate (ev->target_frame, true, true, false);
                } else {
-                       // cerr << "soft locate to+roll " << ev->target_frame << endl;
+                       /* args: roll after locate, do flush, not with loop */
                        start_locate (ev->target_frame, true, true, false);
                }
                _send_timecode_update = true;
@@ -1053,7 +1065,7 @@ Session::process_event (SessionEvent* ev)
 
 
        case SessionEvent::SetTransportSpeed:
-               set_transport_speed (ev->speed, ev->yes_or_no, ev->second_yes_or_no);
+               set_transport_speed (ev->speed, ev->yes_or_no, ev->second_yes_or_no, ev->third_yes_or_no);
                break;
 
        case SessionEvent::PunchIn:
@@ -1092,6 +1104,7 @@ Session::process_event (SessionEvent* ev)
                break;
 
        case SessionEvent::RangeLocate:
+               /* args: roll after locate, do flush, not with loop */
                start_locate (ev->target_frame, true, true, false);
                remove = false;
                del = false;