X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Ffile_source.cc;h=3ec561d66718f103db1dd1ed7c3d56619676e3c9;hb=dac57703ccd7205ac94c14b407b802a69f4187f1;hp=507f0df49c84647144cc616cfa4b1c8b4ec430d8;hpb=d5be54080fa25e45e8bf441e9c72e53ffa3daa72;p=ardour.git diff --git a/libs/ardour/file_source.cc b/libs/ardour/file_source.cc index 507f0df49c..3ec561d667 100644 --- a/libs/ardour/file_source.cc +++ b/libs/ardour/file_source.cc @@ -58,7 +58,7 @@ FileSource::FileSource (Session& session, DataType type, const string& path, con , _path (path) , _file_is_new (!origin.empty()) // if origin is left unspecified (empty string) then file must exist , _channel (0) - , _origin (origin) + , _origin (origin) { set_within_session_from_path (path); } @@ -148,9 +148,9 @@ FileSource::set_state (const XMLNode& node, int /*version*/) _channel = 0; } - if ((prop = node.property (X_("origin"))) != 0) { - _origin = prop->value(); - } + if ((prop = node.property (X_("origin"))) != 0) { + _origin = prop->value(); + } return 0; } @@ -274,7 +274,7 @@ FileSource::find (Session& s, DataType type, const string& path, bool must_exist vector::iterator j = i; ++j; - + while (j != hits.end()) { if (PBD::equivalent_paths (*i, *j)) { /* *i and *j are the same file; break out of the loop early */ @@ -316,10 +316,10 @@ FileSource::find (Session& s, DataType type, const string& path, bool must_exist } else { /* only one match: happy days */ - + keeppath = de_duped_hits[0]; } - + } else { keeppath = path; } @@ -566,7 +566,7 @@ FileSource::is_stub () const if (!empty()) { return false; } - + if (!removable()) { return false; } @@ -577,7 +577,7 @@ FileSource::is_stub () const return true; } - + int FileSource::rename (const string& newpath) { @@ -590,7 +590,7 @@ FileSource::rename (const string& newpath) return -1; } - if (Glib::file_test (oldpath.c_str(), Glib::FILE_TEST_EXISTS)) { + if (Glib::file_test (oldpath.c_str(), Glib::FILE_TEST_EXISTS)) { /* rename only needed if file exists on disk */ if (::rename (oldpath.c_str(), newpath.c_str()) != 0) { error << string_compose (_("cannot rename file %1 to %2 (%3)"), oldpath, newpath, strerror(errno)) << endmsg; @@ -604,4 +604,4 @@ FileSource::rename (const string& newpath) return 0; } - +