ardour/livetrax
13
0
Fork 0
Code

Compare commits

base: ardour:3823ec122c1b76bc2aa9ddbddfc652e013f93078
Branches Tags
ardour:master
ardour:livetrax+10.1
...
compare: ardour:81d1ad58902af64f3801fc3ac14fc9b75b2b6513
Branches Tags
ardour:master
ardour:livetrax+10.1

4 Commits
3823ec122c ... 81d1ad5890

Author SHA1 Message Date
Paul Davis
81d1ad5890 L: during Route::set_name(), also rename direct outs 2024-06-01 07:59:40 -06:00
Paul Davis
18ae113b3c Merge branch 'ardour' 2024-06-01 07:58:37 -06:00
Paul Davis
949b4d4017 fix reversed logic in test of Delivery::set_name() 
Note that the Delivery::set_name() method worked correctly, but
the Route::set_name() method would return false incorrectly. This
appears to have no consequences.
 2024-06-01 07:56:42 -06:00
Ben Loftis
0a19b719d4 fix creation of Cue markers via new ruler menu 2024-06-01 08:21:16 -05:00
3 changed files with 11 additions and 4 deletions
Show Stats Expand all files Collapse all files

2
gtk2_ardour/editor_ops.cc
View File

@ -2379,7 +2379,7 @@ Editor::add_location_mark_with_flag (timepos_t const & where, Location::Flags fl
if (!choose_new_marker_name (markername)) {
return;
}
Location *location = new Location (*_session, where, where, markername, flags);
Location *location = new Location (*_session, where, where, markername, flags, cue_id);
begin_reversible_command (_("add marker"));
XMLNode &before = _session->locations()->get_state();

4
gtk2_ardour/editor_rulers.cc
View File

@ -297,9 +297,9 @@ Editor::popup_ruler_menu (timepos_t const & where, ItemType t)
Gtk::MenuItem& cue_submenu = add_items.back();
Gtk::Menu* cue_menu = new Gtk::Menu;
MenuList& cue_items = cue_menu->items();
cue_items.push_back (MenuElem (_("Stop All Cues"), sigc::bind (sigc::mem_fun (*this, &Editor::add_location_mark_with_flag), where, Location::IsCueMarker, CueRecord::stop_all)));
cue_items.push_back (MenuElem (_("Stop All Cues"), sigc::bind (sigc::mem_fun (*this, &Editor::add_location_mark_with_flag), where, Location::Flags(Location::IsMark |Location::IsCueMarker), CueRecord::stop_all)));
for (int32_t n = 0; n < TriggerBox::default_triggers_per_box; ++n) {
cue_items.push_back (MenuElem (string_compose (_("Cue %1"), cue_marker_name (n)), sigc::bind (sigc::mem_fun(*this, &Editor::add_location_mark_with_flag), where, Location::IsCueMarker, n)));
cue_items.push_back (MenuElem (string_compose (_("Cue %1"), cue_marker_name (n)), sigc::bind (sigc::mem_fun(*this, &Editor::add_location_mark_with_flag), where, Location::Flags(Location::IsMark |Location::IsCueMarker), n)));
}
cue_submenu.set_submenu (*cue_menu);
#endif

9
libs/ardour/route.cc
View File

@ -4822,13 +4822,20 @@ Route::set_name (const string& str)
*/
if (_main_outs) {
if (_main_outs->set_name (newname)) {
if (!_main_outs->set_name (newname)) {
/* XXX returning false here is stupid because
we already changed the route name.
*/
return false;
}
}
/* One exception to the above rule: direct outs (LiveTrax) */
if (_direct_outs) {
string do_name = string_compose (_("%1 direct"), newname);
if (!_direct_outs->set_name (do_name)) {
return false;
}
}
}
return ret;