Merging from trunk

[ardour.git] / libs / ardour / ardour / cycle_timer.h

diff --git a/libs/ardour/ardour/cycle_timer.h b/libs/ardour/ardour/cycle_timer.h
index 1ec7c7490385301a1d3ce1ff32cdb7b5ad9950c8..b9cbbbf0a8ded5550947f0a33c45228309cf6b0a 100644 (file)
--- a/libs/ardour/ardour/cycle_timer.h
+++ b/libs/ardour/ardour/cycle_timer.h
@@ -22,29 +22,27 @@
 #define __ardour_cycle_timer_h__
 
 #include <string>
-#include <cstdio>
+#include <iostream>
 
 #include <ardour/cycles.h>
 
-using std::string;
-
 class CycleTimer {
   private:
        static float cycles_per_usec;
-       uint32_t long entry;
-       uint32_t long exit;
-       string _name;
+       cycles_t _entry;
+       cycles_t _exit;
+       std::string _name;
        
   public:
-       CycleTimer(string name) : _name (name){
+       CycleTimer(std::string name) : _name (name){
                if (cycles_per_usec == 0) {
                        cycles_per_usec = get_mhz ();
                }
-               entry = get_cycles();
+               _entry = get_cycles();
        }
        ~CycleTimer() {
-               exit = get_cycles();
-               printf ("%s: %.9f usecs (%lu-%lu)\n", _name.c_str(), (float) (exit - entry) / cycles_per_usec, entry, exit);
+               _exit = get_cycles();
+               std::cerr << _name << ": " << (float) (_exit - _entry) / cycles_per_usec << " (" <<  _entry << ", " << _exit << ')' << endl;
        }
 
        static float get_mhz ();