From b88e7fdcca8ef8fa4c22f93c2934b30713ab4716 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 28 Nov 2009 22:36:06 +0000 Subject: [PATCH] Move is_embedded calculation to a single place. git-svn-id: svn://localhost/ardour2/branches/3.0@6206 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/file_source.h | 2 ++ libs/ardour/file_source.cc | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libs/ardour/ardour/file_source.h b/libs/ardour/ardour/file_source.h index ce34f1c0d4..4b17881a0b 100644 --- a/libs/ardour/ardour/file_source.h +++ b/libs/ardour/ardour/file_source.h @@ -67,6 +67,8 @@ protected: virtual int move_dependents_to_trash() { return 0; } + void set_embedded_from_name(); + bool removable () const; Glib::ustring _path; diff --git a/libs/ardour/file_source.cc b/libs/ardour/file_source.cc index 6ebbf0b523..08ba0eb23e 100644 --- a/libs/ardour/file_source.cc +++ b/libs/ardour/file_source.cc @@ -70,7 +70,7 @@ FileSource::FileSource (Session& session, const XMLNode& node, bool /*must_exist , _file_is_new (false) { _path = _name; - _is_embedded = (_path.find(PATH_SEP) != string::npos); + set_embedded_from_name(); } bool @@ -103,6 +103,12 @@ FileSource::init (const ustring& pathstr, bool must_exist) return 0; } +void +FileSource::set_embedded_from_name () +{ + _is_embedded = (_name.find(PATH_SEP) != string::npos); +} + int FileSource::set_state (const XMLNode& node, int /*version*/) { @@ -114,7 +120,7 @@ FileSource::set_state (const XMLNode& node, int /*version*/) _channel = 0; } - _is_embedded = (_name.find(PATH_SEP) == string::npos); + set_embedded_from_name(); return 0; }