diff options
| author | Nick Mainsbridge <beatroute@iprimus.com.au> | 2006-04-04 02:28:44 +0000 |
|---|---|---|
| committer | Nick Mainsbridge <beatroute@iprimus.com.au> | 2006-04-04 02:28:44 +0000 |
| commit | af5815e79bcd2a17edbdf5d45f1c7df02af546d8 (patch) | |
| tree | ab9b559db6408c23cb1a0a689aa7b98617e97b7d /libs | |
| parent | 0f0c078a570ba09a736602ae1e62b93364251da5 (diff) | |
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
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/diskstream.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/session.cc | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc index 5e1f8251c7..542ff29e9a 100644 --- a/libs/ardour/diskstream.cc +++ b/libs/ardour/diskstream.cc @@ -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"; diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 71270f5e35..5e9a196c9a 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -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; } |