diff options
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/directory_names.h | 3 | ||||
| -rw-r--r-- | libs/ardour/ardour/file_source.h | 3 | ||||
| -rw-r--r-- | libs/ardour/ardour/playlist.h | 3 | ||||
| -rw-r--r-- | libs/ardour/ardour/region.h | 1 | ||||
| -rw-r--r-- | libs/ardour/ardour/region_factory.h | 1 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/session_directory.h | 11 | ||||
| -rw-r--r-- | libs/ardour/ardour/session_playlists.h | 1 |
8 files changed, 13 insertions, 12 deletions
diff --git a/libs/ardour/ardour/directory_names.h b/libs/ardour/ardour/directory_names.h index a5fd6dc754..0d330cd5a5 100644 --- a/libs/ardour/ardour/directory_names.h +++ b/libs/ardour/ardour/directory_names.h @@ -11,8 +11,7 @@ extern const char* const old_sound_dir_name; extern const char* const sound_dir_name; extern const char* const midi_dir_name; extern const char* const midi_patch_dir_name; -extern const char* const dead_sound_dir_name; -extern const char* const dead_midi_dir_name; +extern const char* const dead_dir_name; extern const char* const interchange_dir_name; extern const char* const peak_dir_name; extern const char* const export_dir_name; diff --git a/libs/ardour/ardour/file_source.h b/libs/ardour/ardour/file_source.h index e114f82816..23b8b8f8c8 100644 --- a/libs/ardour/ardour/file_source.h +++ b/libs/ardour/ardour/file_source.h @@ -50,6 +50,9 @@ public: int unstubify (); void stubify (); + bool is_stub () const; + + static bool is_stub_path (const std::string& path); virtual bool safe_file_extension (const std::string& path) const = 0; diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index a9bbd9346b..e21199e642 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -159,6 +159,7 @@ public: bool region_is_shuffle_constrained (boost::shared_ptr<Region>); bool has_region_at (framepos_t const) const; + bool uses_source (boost::shared_ptr<const Source> src) const; framepos_t find_next_transient (framepos_t position, int dir); @@ -204,6 +205,8 @@ public: virtual bool destroy_region (boost::shared_ptr<Region>) = 0; + void sync_all_regions_with_regions (); + /* special case function used by UI selection objects, which have playlists that actually own the regions within them. */ diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index 1b88ff1d69..17ea1362d8 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -176,6 +176,7 @@ class Region bool region_list_equivalent (boost::shared_ptr<const Region>) const; bool source_equivalent (boost::shared_ptr<const Region>) const; bool uses_source (boost::shared_ptr<const Source>) const; + bool uses_source_path (const std::string&) const; std::string source_string () const; diff --git a/libs/ardour/ardour/region_factory.h b/libs/ardour/ardour/region_factory.h index b47ba71cc9..647e1fe7d8 100644 --- a/libs/ardour/ardour/region_factory.h +++ b/libs/ardour/ardour/region_factory.h @@ -80,6 +80,7 @@ public: static boost::shared_ptr<Region> create (SourceList& srcs, const XMLNode&); static void get_regions_using_source (boost::shared_ptr<Source>, std::set<boost::shared_ptr<Region> >& ); + static void remove_regions_using_source (boost::shared_ptr<Source>); static void map_remove (boost::shared_ptr<Region>); static void map_remove_with_equivalents (boost::shared_ptr<Region>); diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index a66b3352fc..bf3df2f0a8 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -173,7 +173,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi std::string sound_dir (bool with_path = true) const; std::string peak_dir () const; - std::string dead_sound_dir () const; + std::string dead_dir () const; std::string automation_dir () const; std::string analysis_dir() const; std::string plugins_dir() const; diff --git a/libs/ardour/ardour/session_directory.h b/libs/ardour/ardour/session_directory.h index bcde4bdf2c..b7de1c8f0f 100644 --- a/libs/ardour/ardour/session_directory.h +++ b/libs/ardour/ardour/session_directory.h @@ -90,18 +90,11 @@ public: const PBD::sys::path peak_path () const; /** - * @return The absolute path to the directory that audio - * files are moved to when they are no longer part of the - * session. - */ - const PBD::sys::path dead_sound_path () const; - - /** - * @return The absolute path to the directory that midi + * @return The absolute path to the directory that source * files are moved to when they are no longer part of the * session. */ - const PBD::sys::path dead_midi_path () const; + const PBD::sys::path dead_path () const; /** * @return The absolute path to the directory that audio diff --git a/libs/ardour/ardour/session_playlists.h b/libs/ardour/ardour/session_playlists.h index 0a20c7b905..fe47d171ad 100644 --- a/libs/ardour/ardour/session_playlists.h +++ b/libs/ardour/ardour/session_playlists.h @@ -57,6 +57,7 @@ public: void unassigned (std::list<boost::shared_ptr<Playlist> > & list); void destroy_region (boost::shared_ptr<Region>); boost::shared_ptr<Crossfade> find_crossfade (const PBD::ID &); + void sync_all_regions_with_regions (); private: friend class Session; |