* radically cleaned up / refactored midi_clock_slave.cc

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

diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index abe802548ad6e55846b2085f02f18c18a5a2ba87..1ceb2b70faa09cc5ede76b18f6c5fa0633b5de12 100644 (file)
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -50,16 +50,14 @@ using namespace std;
 void
 Session::process (nframes_t nframes)
 {
+       // This is no more the appriopriate place to call cycle
+       // start. cycle_start needs to be called at the Route::roll()
+       // where the signals which we want to mixdown have been calculated.
+       //
        MIDI::Manager::instance()->cycle_start(nframes);
 
        _silent = false;
 
-       if (synced_to_jack() && waiting_to_start) {
-               if ( _engine.transport_state() == AudioEngine::TransportRolling) {
-                       actually_start_transport ();
-               }
-       }
-
        if (non_realtime_work_pending()) {
                if (!transport_work_requested ()) {
                        post_transport ();
@@ -68,9 +66,17 @@ Session::process (nframes_t nframes)
        
        (this->*process_function) (nframes);
        
-       MIDI::Manager::instance()->cycle_end();
-
+       // the ticker is for sending time information like MidiClock
+       nframes_t transport_frames = transport_frame();
+       BBT_Time  transport_bbt;
+       bbt_time(transport_frames, transport_bbt);
+       SMPTE::Time transport_smpte;
+       smpte_time(transport_frames, transport_smpte);
+       tick (transport_frames, transport_bbt, transport_smpte); /* EMIT SIGNAL */
+       
        SendFeedback (); /* EMIT SIGNAL */
+       
+       MIDI::Manager::instance()->cycle_end();
 }
 
 void
@@ -489,7 +495,8 @@ Session::follow_slave (nframes_t nframes, nframes_t offset)
                slave_speed = 0.0f;
        }
 
-#if 0
+#ifdef DEBUG_SLAVES
+       if (slave_speed != 0.0)
        cerr << "delta = " << (int) (dir * this_delta)
             << " speed = " << slave_speed 
             << " ts = " << _transport_speed 
@@ -521,22 +528,21 @@ Session::follow_slave (nframes_t nframes, nframes_t offset)
                }
 
                if (delta_accumulator_cnt != 0 || this_delta < _current_frame_rate) {
-                       delta_accumulator[delta_accumulator_cnt++] = dir*this_delta;
+                       delta_accumulator[delta_accumulator_cnt++] = long(dir) * long(this_delta);
                }
                
                if (have_first_delta_accumulator) {
-                       average_slave_delta = 0;
+                       average_slave_delta = 0L;
                        for (int i = 0; i < delta_accumulator_size; ++i) {
                                average_slave_delta += delta_accumulator[i];
                        }
-                       average_slave_delta /= delta_accumulator_size;
-                       if (average_slave_delta < 0) {
+                       average_slave_delta /= long(delta_accumulator_size);
+                       if (average_slave_delta < 0L) {
                                average_dir = -1;
-                               average_slave_delta = -average_slave_delta;
+                               average_slave_delta = abs(average_slave_delta);
                        } else {
                                average_dir = 1;
                        }
-                       // cerr << "avgdelta = " << average_slave_delta*average_dir << endl;
                }
        }
 
@@ -579,10 +585,13 @@ Session::follow_slave (nframes_t nframes, nframes_t offset)
 
                if (slave_state == Waiting) {
 
-                       // cerr << "waiting at " << slave_transport_frame << endl;
+#ifdef DEBUG_SLAVES
+                       cerr << "waiting at " << slave_transport_frame << endl;
+#endif                 
                        if (slave_transport_frame >= slave_wait_end) {
-                               // cerr << "\tstart at " << _transport_frame << endl;
-
+#ifdef DEBUG_SLAVES
+                               cerr << "\tstart at " << _transport_frame << endl;
+#endif
                                slave_state = Running;
 
                                bool ok = true;
@@ -604,20 +613,21 @@ Session::follow_slave (nframes_t nframes, nframes_t offset)
                                        _transport_frame += frame_delta;
                                       
                                } else {
-                                       // cerr << "cannot micro-seek\n";
+                                       cerr << "cannot micro-seek\n";
                                        /* XXX what? */
                                }
 
-                               memset (delta_accumulator, 0, sizeof (nframes_t) * delta_accumulator_size);
-                               average_slave_delta = 0;
+                               memset (delta_accumulator, 0, sizeof (long) * delta_accumulator_size);
+                               average_slave_delta = 0L;
                                this_delta = 0;
                        }
                }
                
                if (slave_state == Running && _transport_speed == 0.0f) {
                        
-                       // cerr << "slave starts transport\n";
-                       
+#ifdef DEBUG_SLAVES
+                       cerr << "slave starts transport\n";
+#endif
                        start_transport ();
                } 
 
@@ -627,9 +637,10 @@ Session::follow_slave (nframes_t nframes, nframes_t offset)
 
                if (_transport_speed != 0.0f) {
 
-                       // cerr << "slave stops transport: " << slave_speed << " frame: " << slave_transport_frame 
-                       // << " tf = " << _transport_frame
-                       // << endl;
+#ifdef DEBUG_SLAVES
+                       cerr << "slave stops transport: " << slave_speed << " frame: " << slave_transport_frame 
+                            << " tf = " << _transport_frame << endl;
+#endif
                        
                        if (Config->get_slave_source() == JACK) {
                                last_stop_frame = _transport_frame;
@@ -639,7 +650,9 @@ Session::follow_slave (nframes_t nframes, nframes_t offset)
                }
 
                if (slave_transport_frame != _transport_frame) {
-                       // cerr << "slave stopped, move to " << slave_transport_frame << endl;
+#ifdef DEBUG_SLAVES                    
+                       cerr << "slave stopped, move to " << slave_transport_frame << endl;
+#endif
                        force_locate (slave_transport_frame, false);
                }
 
@@ -669,21 +682,21 @@ Session::follow_slave (nframes_t nframes, nframes_t offset)
                        float adjusted_speed = slave_speed +
                                (delta / (adjust_seconds * _current_frame_rate));
                        
-                       // cerr << "adjust using " << delta
-                       // << " towards " << adjusted_speed
-                       // << " ratio = " << adjusted_speed / slave_speed
-                       // << " current = " << _transport_speed
-                       // << " slave @ " << slave_speed
-                       // << endl;
+#ifdef DEBUG_DELAY_LOCKED_LOOP
+                       cerr << "adjust using " << delta
+                            << " towards " << adjusted_speed
+                            << " ratio = " << adjusted_speed / slave_speed
+                            << " current = " << _transport_speed
+                            << " slave @ " << slave_speed
+                            << endl;
+#endif
                        
                        request_transport_speed (adjusted_speed);
                        
-#if 1
-                       if ((nframes_t) average_slave_delta > _slave->resolution()) {
-                               // cerr << "not locked\n";
+                       if (abs(average_slave_delta) > (long) _slave->resolution()) {
+                               cerr << "average slave delta greater than slave resolution, going to silent motion\n";
                                goto silent_motion;
                        }
-#endif
                }
        } 
 
@@ -693,7 +706,10 @@ Session::follow_slave (nframes_t nframes, nframes_t offset)
        }
 
   silent_motion:
-
+#ifdef DEBUG_SLAVES    
+       cerr << "reached silent_motion:" <<endl;
+#endif
+       
        if (slave_speed && _transport_speed) {
 
                /* something isn't right, but we should move with the master
@@ -735,6 +751,9 @@ Session::follow_slave (nframes_t nframes, nframes_t offset)
 
   noroll:
        /* don't move at all */
+#ifdef DEBUG_SLAVES    
+       cerr << "reached no_roll:" <<endl;
+#endif
        no_roll (nframes, 0);
        return false;
 }