fix jack transport return value

[ardour.git] / libs / gtkmm2ext / idle_adjustment.cc

diff --git a/libs/gtkmm2ext/idle_adjustment.cc b/libs/gtkmm2ext/idle_adjustment.cc
index 45118283c5121286044d42f0136043a314b33fc8..030d717133b52d8f4eadaa9804366f1045dee075 100644 (file)
--- a/libs/gtkmm2ext/idle_adjustment.cc
+++ b/libs/gtkmm2ext/idle_adjustment.cc
@@ -1,8 +1,30 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #define _BSD_SOURCE
 #include <gtkmm2ext/idle_adjustment.h>
 #include <gtkmm/main.h>
+#include <glibmm/main.h>
 #include <iostream>
 
+#include "pbd/timersub.h"
+
 using namespace Gtk;
 using namespace sigc;
 using namespace Gtkmm2ext;
@@ -11,7 +33,7 @@ IdleAdjustment::IdleAdjustment (Gtk::Adjustment& adj)
 {
        adj.signal_value_changed().connect (mem_fun (*this, &IdleAdjustment::underlying_adjustment_value_changed));
        timeout_queued = 0;
-       gettimeofday (&last_vc, 0);
+       last_vc = g_get_monotonic_time();
 }
 
 IdleAdjustment::~IdleAdjustment ()
@@ -21,7 +43,7 @@ IdleAdjustment::~IdleAdjustment ()
 void
 IdleAdjustment::underlying_adjustment_value_changed ()
 {
-       gettimeofday (&last_vc, 0);
+       last_vc = g_get_monotonic_time();
        
        if (timeout_queued) {
                return;
@@ -34,16 +56,13 @@ IdleAdjustment::underlying_adjustment_value_changed ()
 gint
 IdleAdjustment::timeout_handler ()
 {
-       struct timeval now;
-       struct timeval tdiff;
-
-       gettimeofday (&now, 0);
-
-       timersub (&now, &last_vc, &tdiff);
+       int64_t now, tdiff;
+       now = g_get_monotonic_time();
+       tdiff = now - last_vc;
 
-       std::cerr << "timer elapsed, diff = " << tdiff.tv_sec << " + " << tdiff.tv_usec << std::endl;
+       std::cerr << "timer elapsed, diff = " << tdiff << " usec" << std::endl;
 
-       if (tdiff.tv_sec > 0 || tdiff.tv_usec > 250000) {
+       if (tdiff > 250000) {
                std::cerr << "send signal\n";
                value_changed ();
                timeout_queued = false;