diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-07-22 14:52:05 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-07-22 14:52:05 +0000 |
| commit | 1c1b359ff21aac57bd71d291049d657f66cf31f5 (patch) | |
| tree | b05cc2756c2ec751fd0567d7b7ffb0baa8c1767f /libs/ardour/ardour | |
| parent | 5c17bd3df225b958c2f8510ff03d38bbb513c150 (diff) | |
second (and hopefully) final part of changes to respond to header format changes sensibly: lookup existing files correctly, and don't end up with gapped "take" numbers for successive files since we now remove ::removable() sources when switching to new ones (for audio)
git-svn-id: svn://localhost/ardour2/branches/3.0@7470 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/file_source.h | 3 | ||||
| -rw-r--r-- | libs/ardour/ardour/utils.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/ardour/file_source.h b/libs/ardour/ardour/file_source.h index dfb1b43e58..379d391c73 100644 --- a/libs/ardour/ardour/file_source.h +++ b/libs/ardour/ardour/file_source.h @@ -61,6 +61,7 @@ public: Glib::ustring& found_path); void inc_use_count (); + bool removable () const; protected: FileSource (Session& session, DataType type, @@ -75,8 +76,6 @@ protected: virtual int move_dependents_to_trash() { return 0; } void set_within_session_from_path (const std::string&); - bool removable () const; - Glib::ustring _path; Glib::ustring _take_id; bool _file_is_new; diff --git a/libs/ardour/ardour/utils.h b/libs/ardour/ardour/utils.h index b91a6500db..f3f9c4182c 100644 --- a/libs/ardour/ardour/utils.h +++ b/libs/ardour/ardour/utils.h @@ -105,6 +105,7 @@ ARDOUR::MeterFalloff meter_falloff_from_float (float); float meter_falloff_to_db_per_sec (float); const char* native_header_format_extension (ARDOUR::HeaderFormat, const ARDOUR::DataType& type); +bool matching_unsuffixed_filename_exists_in (const std::string& dir, const std::string& name); #if defined(HAVE_COREAUDIO) || defined(HAVE_AUDIOUNITS) std::string CFStringRefToStdString(CFStringRef stringRef); |