Fix formatting samplecnt_t (aka int64_t aka long long int)

[ardour.git] / gtk2_ardour / editor_audiotrack.cc

diff --git a/gtk2_ardour/editor_audiotrack.cc b/gtk2_ardour/editor_audiotrack.cc
index 5eadac1ca5db595bab7913499803b7b7a792a846..323562c278864f78ddf51902a6e9be7d699549a5 100644 (file)
--- a/gtk2_ardour/editor_audiotrack.cc
+++ b/gtk2_ardour/editor_audiotrack.cc
@@ -1,35 +1,36 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis
+ * Copyright (C) 2006-2012 David Robillard <d@drobilla.net>
+ * Copyright (C) 2007-2016 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2009-2010 Carl Hetherington <carl@carlh.net>
+ *
+ * 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.
+ */
 
-    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.
-
-*/
-
-#include "ardour/location.h"
-#include "ardour/audio_diskstream.h"
 #include "ardour/rc_configuration.h"
 
-#include "ardour_ui.h"
+#include "canvas/canvas.h"
+
 #include "editor.h"
 #include "editing.h"
 #include "audio_time_axis.h"
 #include "route_time_axis.h"
 #include "audio_region_view.h"
 #include "selection.h"
+#include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
@@ -39,7 +40,7 @@ Editor::start_updating_meters ()
 {
        RouteTimeAxisView* rtv;
 
-       if (is_mapped() && _session) {
+       if (contents().is_mapped() && _session) {
                for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
                        if ((rtv = dynamic_cast<RouteTimeAxisView*>(*i)) != 0) {
                                rtv->reset_meter ();
@@ -57,7 +58,7 @@ Editor::stop_updating_meters ()
 
        meters_running = false;
 
-       if (is_mapped() && _session) {
+       if (contents().is_mapped() && _session) {
                for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
                        if ((rtv = dynamic_cast<RouteTimeAxisView*>(*i)) != 0) {
                                rtv->hide_meter ();
@@ -69,12 +70,13 @@ Editor::stop_updating_meters ()
 void
 Editor::toggle_meter_updating()
 {
-       if (Config->get_show_track_meters()) {
+       DisplaySuspender ds;
+       if (UIConfiguration::instance().get_show_track_meters()) {
                start_updating_meters ();
        } else {
                stop_updating_meters ();
        }
 
-       track_canvas_allocate (track_canvas->get_allocation());
+       track_canvas_viewport_allocate (_track_canvas->get_allocation());
 }