Fix formatting samplecnt_t (aka int64_t aka long long int)

[ardour.git] / gtk2_ardour / tempo_lines.h

diff --git a/gtk2_ardour/tempo_lines.h b/gtk2_ardour/tempo_lines.h
index f4ee293e29118694f292813d0513094721992d8d..980b6195e224486dba44b624948294b35f371162 100644 (file)
--- a/gtk2_ardour/tempo_lines.h
+++ b/gtk2_ardour/tempo_lines.h
@@ -1,48 +1,54 @@
 /*
-    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.
-*/
+ * Copyright (C) 2007-2015 David Robillard <d@drobilla.net>
+ * Copyright (C) 2012-2017 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2015-2017 Nick Mainsbridge <mainsbridge@gmail.com>
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #ifndef __ardour_tempo_lines_h__
 #define __ardour_tempo_lines_h__
 
-#include <list>
+#include "ardour/beats_samples_converter.h"
 #include "ardour/tempo.h"
 
+#include "canvas/line_set.h"
+
 class TempoLines {
 public:
-       TempoLines(ArdourCanvas::Canvas& canvas, ArdourCanvas::Group* group, double screen_height);
+       TempoLines (ArdourCanvas::Container* group, double screen_height, ARDOUR::BeatsSamplesConverter* bfc);
+       ~TempoLines ();
 
-       void tempo_map_changed();
+       void tempo_map_changed(samplepos_t new_origin);
 
-       void draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin, 
-                  const ARDOUR::TempoMap::BBTPointList::const_iterator& end, 
-                  double frames_per_unit);
+       void draw (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
+                  unsigned                                 divisions,
+                  ARDOUR::samplecnt_t                      leftmost_sample,
+                  ARDOUR::samplecnt_t                      sample_rate);
 
        void show();
        void hide();
 
 private:
-        typedef std::list<ArdourCanvas::Line*> Lines;
-       Lines _lines;
-        Lines _cache;
+       void draw_ticks (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
+                        unsigned                                 divisions,
+                        ARDOUR::samplecnt_t                      leftmost_sample,
+                        ARDOUR::samplecnt_t                      sample_rate);
 
-        ArdourCanvas::Canvas& _canvas;
-       ArdourCanvas::Group*  _group;
-       double                _height;
+       ArdourCanvas::LineSet lines;
+       ARDOUR::BeatsSamplesConverter* _bfc;
 };
 
 #endif /* __ardour_tempo_lines_h__ */