diff options
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/file_source.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 10 | ||||
| -rw-r--r-- | libs/ardour/ardour/smf_source.h | 9 |
3 files changed, 8 insertions, 15 deletions
diff --git a/libs/ardour/ardour/file_source.h b/libs/ardour/ardour/file_source.h index 37a7e67d2e..8b8adfeb66 100644 --- a/libs/ardour/ardour/file_source.h +++ b/libs/ardour/ardour/file_source.h @@ -85,6 +85,10 @@ public: void existence_check (); virtual void prevent_deletion (); + /** Rename the file on disk referenced by this source to \param newname + */ + int rename (const std::string& name); + protected: FileSource (Session& session, DataType type, const std::string& path, diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index a7ca2d00ee..03eccd40a3 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -196,10 +196,10 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop std::string peak_path (std::string) const; std::string peak_path_from_audio_path (std::string) const; - std::string new_audio_source_name (const std::string&, uint32_t nchans, uint32_t chan, bool destructive); - std::string new_midi_source_name (const std::string&); - std::string new_source_path_from_name (DataType type, const std::string&); + std::string new_audio_source_path (const std::string&, uint32_t nchans, uint32_t chan, bool destructive, bool take_required); + std::string new_midi_source_path (const std::string&); RouteList new_route_from_template (uint32_t how_many, const std::string& template_path, const std::string& name); + std::vector<std::string> get_paths_for_new_sources (bool allow_replacing, const std::string& import_file_path, uint32_t channels); void process (pframes_t nframes); @@ -549,8 +549,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop boost::shared_ptr<Region> find_whole_file_parent (boost::shared_ptr<Region const>) const; - std::string path_from_region_name (DataType type, std::string name, std::string identifier); - boost::shared_ptr<Region> XMLRegionFactory (const XMLNode&, bool full); boost::shared_ptr<AudioRegion> XMLAudioRegionFactory (const XMLNode&, bool full); boost::shared_ptr<MidiRegion> XMLMidiRegionFactory (const XMLNode&, bool full); @@ -1485,7 +1483,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop bool no_questions_about_missing_files; - std::string get_best_session_directory_for_new_source (); + std::string get_best_session_directory_for_new_audio (); mutable gint _playback_load; mutable gint _capture_load; diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h index 93adfd71f9..84c45f9b3c 100644 --- a/libs/ardour/ardour/smf_source.h +++ b/libs/ardour/ardour/smf_source.h @@ -47,15 +47,6 @@ public: virtual ~SMFSource (); - /** Rename the file on disk referenced by this source to \param newname - * - * This method exists only for MIDI file sources, not for audio, which - * can never be renamed. It exists for MIDI so that we can get - * consistent and sane region/source numbering when regions are added - * manually (which never happens with audio). - */ - int rename (const std::string& name); - bool safe_file_extension (const std::string& path) const { return safe_midi_file_extension(path); } |