From 2a011e19cb4317b83b8c179969778545c291dbcb Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Mon, 7 Dec 2020 23:41:55 +0100
Subject: [PATCH] Update AxisView API: name_label is owned by the axis

---
 gtk2_ardour/axis_view.cc      | 17 +++++++++++++++++
 gtk2_ardour/axis_view.h       |  1 +
 gtk2_ardour/time_axis_view.cc | 16 ----------------
 gtk2_ardour/time_axis_view.h  |  1 -
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/gtk2_ardour/axis_view.cc b/gtk2_ardour/axis_view.cc
index c946d3cd8d..b13a0d8891 100644
--- a/gtk2_ardour/axis_view.cc
+++ b/gtk2_ardour/axis_view.cc
@@ -41,6 +41,7 @@
 #include "ardour_ui.h"
 #include "gui_object.h"
 #include "axis_view.h"
+#include "ui_config.h"
 #include "utils.h"
 
 #include "pbd/i18n.h"
@@ -145,3 +146,19 @@ AxisView::set_selected (bool yn)
 
 	Selectable::set_selected (yn);
 }
+
+void
+AxisView::set_name_ellipsize_mode ()
+{
+	switch (UIConfiguration::instance().get_time_axis_name_ellipsize_mode()) {
+	case -1:
+		name_label.set_ellipsize (Pango::ELLIPSIZE_START);
+		break;
+	case 1:
+		name_label.set_ellipsize (Pango::ELLIPSIZE_END);
+		break;
+	default:
+		name_label.set_ellipsize (Pango::ELLIPSIZE_MIDDLE);
+		break;
+	}
+}
diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index e1db192b7e..df464983f7 100644
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -136,6 +136,7 @@ protected:
 	static std::list<Gdk::Color> used_colors;
 
 	Gtk::Label name_label;
+	void set_name_ellipsize_mode ();
 
 	Gtk::Label inactive_label;
 	Gtk::Table inactive_table;
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 590e3cef75..a6c76a195f 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -1413,19 +1413,3 @@ TrackViewList::filter_to_unique_playlists ()
 	}
 	return ts;
 }
-
-void
-TimeAxisView::set_name_ellipsize_mode ()
-{
-	switch (UIConfiguration::instance().get_time_axis_name_ellipsize_mode()) {
-	case -1:
-		name_label.set_ellipsize (Pango::ELLIPSIZE_START);
-		break;
-	case 1:
-		name_label.set_ellipsize (Pango::ELLIPSIZE_END);
-		break;
-	default:
-		name_label.set_ellipsize (Pango::ELLIPSIZE_MIDDLE);
-		break;
-	}
-}
diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index e7f3b27263..f5a6dc2fdc 100644
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -336,7 +336,6 @@ private:
 
 	void compute_heights ();
 	bool maybe_set_cursor (int y);
-	void set_name_ellipsize_mode ();
 
 }; /* class TimeAxisView */