new region names are now based on file source names, standardise capitalisation of location right click menus
git-svn-id: svn://localhost/trunk/ardour2@440 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
@@ -1807,7 +1807,7 @@ DiskStream::transport_stopped (struct tm& when, time_t twhen, bool abort_capture
|
||||
for (buffer_position = channels[0].write_source->last_capture_start_frame(), ci = capture_info.begin(); ci != capture_info.end(); ++ci) {
|
||||
|
||||
string region_name;
|
||||
_session.region_name (region_name, _name, false);
|
||||
_session.region_name (region_name, channels[0].write_source->name(), false);
|
||||
|
||||
// cerr << _name << ": based on ci of " << (*ci)->start << " for " << (*ci)->frames << " add a region\n";
|
||||
|
||||
|
||||
@@ -2345,15 +2345,14 @@ Session::region_name (string& result, string base, bool newlevel) const
|
||||
} else {
|
||||
string::size_type pos;
|
||||
|
||||
if ((pos = base.find_last_of ('-')) == string::npos) {
|
||||
pos = base.find_last_of ('.');
|
||||
}
|
||||
pos = base.find_last_of ('.');
|
||||
|
||||
/* pos may be npos, but then we just use entire base */
|
||||
|
||||
subbase = base.substr (0, pos);
|
||||
|
||||
}
|
||||
|
||||
|
||||
bool name_taken = true;
|
||||
|
||||
{
|
||||
@@ -2385,7 +2384,6 @@ Session::region_name (string& result, string base, bool newlevel) const
|
||||
/*NOTREACHED*/
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user