From 00305c070d24ac7627b0d6395300d2d293a53127 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Tue, 28 May 2024 08:41:23 -0500 Subject: [PATCH 1/3] scene markers are not cue markers (fix copy+paste error) --- gtk2_ardour/editor_markers.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index d2bd043a22..571135dc0f 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -2135,7 +2135,7 @@ Editor::update_mark_and_range_visibility () } else if (location->is_section()) { } else if (location->is_scene()) { - mark_type = CueMarks; + mark_type = SceneMarks; } else { mark_type = LocationMarks; } From 34875e4f3f4aa73b3134d2012bd537eb0ef81764 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Tue, 28 May 2024 08:41:38 -0500 Subject: [PATCH 2/3] label cd track markers distinctly --- gtk2_ardour/editor_ops.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index cd68bb926f..e8cc160e31 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -2368,6 +2368,8 @@ Editor::add_location_mark_with_flag (timepos_t const & where, Location::Flags fl markername = string_compose (_("cue %1"), cue_marker_name (cue_id)); } else if (flags & Location::IsSection) { namebase = _("section"); + } else if (flags & Location::IsCDMarker) { + namebase = _("cd trk"); } else { namebase = _("mark"); } From 875e89ff67704bc3f537aed25a0469c73510162d Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Tue, 28 May 2024 08:42:16 -0500 Subject: [PATCH 3/3] new Locations should be set IsMark, so there is no separate start/end --- gtk2_ardour/editor_rulers.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index fa89ff1450..3121310d35 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -286,7 +286,7 @@ Editor::popup_ruler_menu (timepos_t const & where, ItemType t) Gtk::MenuItem& add_menu = ruler_items.back(); Gtk::Menu* a_menu = new Gtk::Menu; MenuList& add_items = a_menu->items(); - add_items.push_back (MenuElem (_("Location Marker"), sigc::bind (sigc::mem_fun(*this, &Editor::add_location_mark_with_flag), where, Location::Flags (0), 0))); + add_items.push_back (MenuElem (_("Location Marker"), sigc::bind (sigc::mem_fun(*this, &Editor::add_location_mark_with_flag), where, Location::Flags (Location::IsMark), 0))); add_items.push_back (MenuElem (_("Arrangement Marker"), sigc::bind (sigc::mem_fun(*this, &Editor::add_location_mark_with_flag), where, Location::Flags(Location::IsMark | Location::IsSection), 0))); add_items.push_back (MenuElem (_("CD Track Marker"), sigc::bind (sigc::mem_fun(*this, &Editor::add_location_mark_with_flag), where, Location::Flags(Location::IsMark |Location::IsCDMarker), 0))); add_items.push_back (MenuElem ("Cue Marker..."));