allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

update bbe62da55a - use last-modified-with, strip git-rev

Browse Source
This commit is contained in:
Robin Gareus
2017-01-21 00:47:33 +01:00
parent 0808b87138
commit 2dc392b517
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/session.h
View File

@@ -199,7 +199,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
virtual ~Session ();
static int get_info_from_path (const std::string& xmlpath, float& sample_rate, SampleFormat& data_format, std::string& created_version);
static int get_info_from_path (const std::string& xmlpath, float& sample_rate, SampleFormat& data_format, std::string& program_version);
static std::string get_snapshot_from_instant (const std::string& session_dir);
/** a monotonic counter used for naming user-visible things uniquely

12
libs/ardour/session_state.cc
View File

@@ -4428,11 +4428,11 @@ Session::rename (const std::string& new_name)
}
int
Session::get_info_from_path (const string& xmlpath, float& sample_rate, SampleFormat& data_format, std::string& created_version)
Session::get_info_from_path (const string& xmlpath, float& sample_rate, SampleFormat& data_format, std::string& program_version)
{
bool found_sr = false;
bool found_data_format = false;
created_version = "";
program_version = "";
if (!Glib::file_test (xmlpath, Glib::FILE_TEST_EXISTS)) {
return -1;
@@ -4470,9 +4470,13 @@ Session::get_info_from_path (const string& xmlpath, float& sample_rate, SampleFo
node = node->children;
while (node != NULL) {
if (!strcmp((const char*) node->name, "ProgramVersion")) {
xmlChar* val = xmlGetProp (node, (const xmlChar*)"created-with");
xmlChar* val = xmlGetProp (node, (const xmlChar*)"modified-with");
if (val) {
created_version = string ((const char*)val);
program_version = string ((const char*)val);
size_t sep = program_version.find_first_of("-");
if (sep != string::npos) {
program_version = program_version.substr (0, sep);
}
}
xmlFree (val);
}