LADI
/
ardour
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

route removal fixes: notify user that removing a route will result in a save. and clear a routes solos before deleting it so the other tracks will unmute 

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@6753 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Ben Loftis 2010-03-12 16:45:34 +00:00
parent f37752557b
commit 1007b60ae7
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk2_ardour/editor_ops.cc
View File

@ -5886,16 +5886,17 @@ Editor::remove_tracks ()
if (nbusses) {
prompt = string_compose (_("Do you really want to remove %1 %2 and %3 %4?\n"
"(You may also lose the playlists associated with the %2)\n\n"
"This action cannot be undone!"),
"This action cannot be undone, and the session file will be overwritten!"),
ntracks, trackstr, nbusses, busstr);
} else {
prompt = string_compose (_("Do you really want to remove %1 %2?\n"
"(You may also lose the playlists associated with the %2)\n\n"
"This action cannot be undone!"),
"This action cannot be undone, and the session file will be overwritten!"),
ntracks, trackstr);
}
} else if (nbusses) {
prompt = string_compose (_("Do you really want to remove %1 %2?"),
prompt = string_compose (_("Do you really want to remove %1 %2?\n\n"
"This action cannot be undone, and the session file will be overwritten!"),
nbusses, busstr);
}

4
gtk2_ardour/route_ui.cc
View File

@ -924,9 +924,9 @@ RouteUI::remove_this_route ()
string prompt;
if (is_track()) {
prompt = string_compose (_("Do you really want to remove track \"%1\" ?\n\nYou may also lose the playlist used by this track.\n(cannot be undone)"), _route->name());
prompt = string_compose (_("Do you really want to remove track \"%1\" ?\n\nYou may also lose the playlist used by this track.\n\n(This action cannot be undone, and the session file will be overwritten!)"), _route->name());
} else {
prompt = string_compose (_("Do you really want to remove bus \"%1\" ?\n(cannot be undone)"), _route->name());
prompt = string_compose (_("Do you really want to remove bus \"%1\" ?\n\n(This action cannot be undone, and the session file will be overwritten!)"), _route->name());
}
choices.push_back (_("No, do nothing."));

2
gtk2_ardour/visual_time_axis.cc
View File

@ -273,7 +273,7 @@ VisualTimeAxis::remove_this_time_axis(void* src)
{
vector<string> choices;
std::string prompt = string_compose (_("Do you really want to remove track \"%1\" ?\n(cannot be undone)"), time_axis_name);
std::string prompt = string_compose (_("Do you really want to remove track \"%1\" ?\n\n(This action cannot be undone, and the session file will be overwritten!)"), time_axis_name);
choices.push_back (_("No, do nothing."));
choices.push_back (_("Yes, remove it."));

3
libs/ardour/session.cc
View File

@ -2247,6 +2247,9 @@ Session::add_diskstream (boost::shared_ptr<Diskstream> dstream)
void
Session::remove_route (shared_ptr<Route> route)
{
//clear solos before removing the route
route->set_solo ( false, this);
{
RCUWriter<RouteList> writer (routes);
shared_ptr<RouteList> rs = writer.get_copy ();