Merge branch 'mingw-updates' of https://github.com/mojofunk/ardour into cairocanvas

diff --cc libs/backends/dummy/dummy_audiobackend.cc
index 5f72c935199f319b5289644eba64892449cc0b4c,136e5b865546d22b4c87cda0809928f0258926d0..01e8085e04614e9dc4f24441fabff47a11bc4f38
--- 1/libs/backends/dummy/dummy_audiobackend.cc
--- 2/libs/backends/dummy/dummy_audiobackend.cc
+++ b/libs/backends/dummy/dummy_audiobackend.cc
@@@ -1009,20 -989,20 +1005,20 @@@ DummyAudioBackend::main_process_thread 
                }
                _processed_samples += _samples_per_period;
                if (!_freewheeling) {
 -                      ::gettimeofday (&clock2, NULL);
 -                      const int elapsed_time = (clock2.tv_sec - clock1.tv_sec) * 1000000 + (clock2.tv_usec - clock1.tv_usec);
 -                      const int nomial_time = 1000000 * _samples_per_period / _samplerate;
 +                      clock2 = g_get_monotonic_time();
 +                      const int64_t elapsed_time = clock2 - clock1;
 +                      const int64_t nomial_time = 1e6 * _samples_per_period / _samplerate;
                        _dsp_load = elapsed_time / (float) nomial_time;
                        if (elapsed_time < nomial_time) {
-                               ::usleep (nomial_time - elapsed_time);
+                               Glib::usleep (nomial_time - elapsed_time);
                        } else {
-                               ::usleep (100); // don't hog cpu
+                               Glib::usleep (100); // don't hog cpu
                        }
                } else {
                        _dsp_load = 1.0;
-                       ::usleep (100); // don't hog cpu
+                       Glib::usleep (100); // don't hog cpu
                }
 -              ::gettimeofday (&clock1, NULL);
 +              clock1 = g_get_monotonic_time();
        }
        _running = false;
        return 0;