From 848e0e0a101edf35a4ffe4e5502a3eeab29acc1e Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 6 Sep 2023 19:36:26 -0600
Subject: [PATCH] fix manual errors during rebase against master

---
 gtk2_ardour/editing.h         | 12 ++++++++++++
 gtk2_ardour/editing_syms.h    |  4 ++++
 gtk2_ardour/editor_actions.cc |  1 -
 gtk2_ardour/enums.cc          |  1 +
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/gtk2_ardour/editing.h b/gtk2_ardour/editing.h
index 1b760c6f1b..11f87ae38d 100644
--- a/gtk2_ardour/editing.h
+++ b/gtk2_ardour/editing.h
@@ -199,6 +199,18 @@ enum InsertTimeOption {
 #undef INSERTTIMEOPT
 #define INSERTTIMEOPT(a) /*empty*/
 
+#undef NOTENAMEDISPLAY
+#define NOTENAMEDISPLAY(a) a,
+enum NoteNameDisplay {
+	#include "editing_syms.h"
+};
+
+extern const char *notenamedisplaystrs[];
+inline const char* enum2str(NoteNameDisplay m) {return notenamedisplaystrs[m];}
+
+#undef NOTENAMEDISPLAY
+#define NOTENAMEDISPLAY(a) /*empty*/
+
 /////////////////////
 // These don't need their state saved. yet...
 enum CutCopyOp {
diff --git a/gtk2_ardour/editing_syms.h b/gtk2_ardour/editing_syms.h
index c3f4cec156..5889710a02 100644
--- a/gtk2_ardour/editing_syms.h
+++ b/gtk2_ardour/editing_syms.h
@@ -109,3 +109,7 @@ EDITPOINT(EditAtMouse)
 INSERTTIMEOPT(LeaveIntersected)
 INSERTTIMEOPT(MoveIntersected)
 INSERTTIMEOPT(SplitIntersected)
+
+NOTENAMEDISPLAY(Always)
+NOTENAMEDISPLAY(WithMIDNAM)
+NOTENAMEDISPLAY(Never)
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 6488f27dd3..2190582e4f 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -1180,7 +1180,6 @@ Editor::draw_channel_action (int c)
 {
 	char buf[64];
 	const char* action = 0;
-	char buf[64];
 	RefPtr<Action> act;
 
 	if (c==DRAW_CHAN_AUTO) {
diff --git a/gtk2_ardour/enums.cc b/gtk2_ardour/enums.cc
index f3646d998e..5e98108b62 100644
--- a/gtk2_ardour/enums.cc
+++ b/gtk2_ardour/enums.cc
@@ -60,6 +60,7 @@ setup_gtk_ardour_enums ()
 	StartupFSM::DialogID startup_dialog;
 	Gtk::ResponseType dialog_response;
 	AddRouteDialog::TypeWanted type_wanted;
+	NoteNameDisplay note_name_display;
 
 #define REGISTER(e) enum_writer.register_distinct (typeid(e).name(), i, s); i.clear(); s.clear()
 #define REGISTER_BITS(e) enum_writer.register_bits (typeid(e).name(), i, s); i.clear(); s.clear()