Clean up handling of track vs region automation a bit.

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

diff --git a/libs/ardour/pi_controller.cc b/libs/ardour/pi_controller.cc
index 1db36355fe50d509d2d89459bf903e8b1d4f56ff..0d9e5b8c37e43ba1cfed3a9f44468742e58b5639 100644 (file)
--- a/libs/ardour/pi_controller.cc
+++ b/libs/ardour/pi_controller.cc
@@ -56,10 +56,11 @@ PIController::~PIController ()
 }
 
 double
-PIController::get_ratio (int fill_level)
+PIController::get_ratio (int fill_level, int period_size)
 {
        double offset = fill_level;
        double this_catch_factor = catch_factor;
+       double this_catch_factor2 = catch_factor2 * 4096.0/(double)period_size;
 
        
        // Save offset.
@@ -96,7 +97,7 @@ PIController::get_ratio (int fill_level)
        // u(t) = K * (e(t) + 1/T \int e(t') dt')
        // Kp = 1/catch_factor and T = catch_factor2  Ki = Kp/T 
        current_resample_factor 
-                = static_resample_factor - smooth_offset / this_catch_factor - offset_integral / this_catch_factor / catch_factor2;
+                = static_resample_factor - smooth_offset / this_catch_factor - offset_integral / this_catch_factor / this_catch_factor2;
        
        // Now quantize this value around resample_mean, so that the noise which is in the integral component doesnt hurt.
        current_resample_factor = floor((current_resample_factor - resample_mean) * controlquant + 0.5) / controlquant + resample_mean;
@@ -151,14 +152,15 @@ PIChaser::~PIChaser() {
 }
 
 double
-PIChaser::get_ratio(nframes64_t realtime, nframes64_t chasetime, nframes64_t slavetime, bool in_control ) {
+PIChaser::get_ratio(nframes64_t chasetime_measured, nframes64_t chasetime, nframes64_t slavetime_measured, nframes64_t slavetime, bool in_control, int period_size ) {
 
-       feed_estimator( realtime, chasetime );
-       std::cerr << (double)realtime/48000.0 << " " << chasetime << " " << slavetime << " ";
+       feed_estimator( chasetime_measured, chasetime );
+       std::cerr << (double)chasetime_measured/48000.0 << " " << chasetime << " " << slavetime << " ";
        double crude = get_estimate();
        double fine;  
+       nframes64_t massaged_chasetime = chasetime + (nframes64_t)( (double)(slavetime_measured - chasetime_measured) * crude );
 
-           fine = pic->get_ratio( slavetime - chasetime );
+       fine = pic->get_ratio( slavetime - massaged_chasetime, period_size );
        if (in_control) {
            if (fabs(fine-crude) > crude*speed_threshold) {
                std::cout << "reset to " << crude << " fine = " << fine << "\n";