fix up big clock aspect ratio; fix color handling in audio clocks

[ardour.git] / gtk2_ardour / tempo_lines.h

diff --git a/gtk2_ardour/tempo_lines.h b/gtk2_ardour/tempo_lines.h
index 7d276595e45bcc3b7dff9e02cb6277a5b9f43987..0991ba7559c9078e9a073737235e6f1241077943 100644 (file)
--- a/gtk2_ardour/tempo_lines.h
+++ b/gtk2_ardour/tempo_lines.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    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
@@ -22,12 +22,12 @@
 #include <map>
 #include <boost/pool/pool.hpp>
 #include <boost/pool/pool_alloc.hpp>
-#include <ardour/tempo.h>
+#include "ardour/tempo.h"
 #include "canvas.h"
 #include "simpleline.h"
 
 typedef boost::fast_pool_allocator<
-               std::pair<double, ArdourCanvas::SimpleLine>,
+               std::pair<const double, ArdourCanvas::SimpleLine*>,
                boost::default_user_allocator_new_delete,
                boost::details::pool::null_mutex,
                8192>
@@ -35,7 +35,7 @@ typedef boost::fast_pool_allocator<
 
 class TempoLines {
 public:
-       TempoLines(ArdourCanvas::Canvas& canvas, ArdourCanvas::Group* group);
+       TempoLines(ArdourCanvas::Canvas& canvas, ArdourCanvas::Group* group, double screen_height);
 
        void tempo_map_changed();
 
@@ -52,6 +52,7 @@ private:
        ArdourCanvas::Group*  _group;
        double                _clean_left;
        double                _clean_right;
+       double                _height;
 };
 
 #endif /* __ardour_tempo_lines_h__ */