ardour/livetrax
13
0
Fork 0
Code

Merge branch 'ardour'

Browse Source
This commit is contained in:
Robin Gareus 2024-05-28 15:51:14 +02:00
commit 54316c5129
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editor_markers.cc
View File

@ -2139,7 +2139,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;
}

2
gtk2_ardour/editor_ops.cc
View File

@ -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");
}

2
gtk2_ardour/editor_rulers.cc
View File

@ -289,7 +289,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)));
#ifndef LIVETRAX
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)));