ardour/livetrax
13
0
Fork 0
Code

change the semantics of AudioFileSource::peak_path() and Session::peak_path() a little.

Browse Source 
If given a full path that points outside the current session but is within another ardour session,
attempt to use the peakfiles present in that other session.
This commit is contained in:
Paul Davis 2015-05-28 19:08:47 -04:00
parent 1291f3d2e8
commit 2cb3cbe491
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/ardour/audiofilesource.cc
View File

@ -168,10 +168,21 @@ AudioFileSource::peak_path (string audio_path)
{
string base;
base = PBD::basename_nosuffix (audio_path);
string::size_type suffix = audio_path.find_last_of ('.');
if (suffix != string::npos) {
base = audio_path.substr (0, suffix);
} else {
warning << string_compose (_("Odd audio file path: %1"), audio_path) << endmsg;
base = audio_path;
}
base += '%';
base += (char) ('A' + _channel);
/* pass in the name/path of the source, with no audio file type suffix
*/
return _session.peak_path (base);
}

36
libs/ardour/session.cc
View File

@ -66,6 +66,7 @@
#include "ardour/control_protocol_manager.h"
#include "ardour/data_type.h"
#include "ardour/debug.h"
#include "ardour/directory_names.h"
#include "ardour/filename_extensions.h"
#include "ardour/graph.h"
#include "ardour/midiport_manager.h"
@ -3745,6 +3746,41 @@ Session::count_sources_by_origin (const string& path)
string
Session::peak_path (string base) const
{
if (Glib::path_is_absolute (base)) {
/* rip the session dir from the audiofile source */
string session_path;
string interchange_dir_string = string (interchange_dir_name) + G_DIR_SEPARATOR;
bool in_another_session = true;
if (base.find (interchange_dir_string) != string::npos) {
session_path = Glib::path_get_dirname (base); /* now ends in audiofiles */
session_path = Glib::path_get_dirname (session_path); /* now ends in session name */
session_path = Glib::path_get_dirname (session_path); /* now ends in interchange */
session_path = Glib::path_get_dirname (session_path); /* now has session path */
/* see if it is within our session */
for (vector<space_and_path>::const_iterator i = session_dirs.begin(); i != session_dirs.end(); ++i) {
if (i->path == session_path) {
in_another_session = false;
break;
}
}
} else {
in_another_session = false;
}
if (in_another_session) {
SessionDirectory sd (session_path);
return Glib::build_filename (sd.peak_path(), Glib::path_get_basename (base) + peakfile_suffix);
}
}
base = Glib::path_get_basename (base);
return Glib::build_filename (_session_dir->peak_path(), base + peakfile_suffix);
}