diff options
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/audiofilesource.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/file_source.h | 14 | ||||
| -rw-r--r-- | libs/ardour/ardour/sndfilesource.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/source_factory.h | 2 |
4 files changed, 13 insertions, 9 deletions
diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h index 57b5ced93c..4f01bf4182 100644 --- a/libs/ardour/ardour/audiofilesource.h +++ b/libs/ardour/ardour/audiofilesource.h @@ -91,7 +91,7 @@ protected: AudioFileSource (Session&, const std::string& path, Source::Flag flags); /** Constructor to be called for new in-session files */ - AudioFileSource (Session&, const std::string& path, Source::Flag flags, + AudioFileSource (Session&, const std::string& path, const std::string& origin, Source::Flag flags, SampleFormat samp_format, HeaderFormat hdr_format); /** Constructor to be called for existing in-session files */ diff --git a/libs/ardour/ardour/file_source.h b/libs/ardour/ardour/file_source.h index 78210916f0..4aadce27e8 100644 --- a/libs/ardour/ardour/file_source.h +++ b/libs/ardour/ardour/file_source.h @@ -75,12 +75,15 @@ public: void inc_use_count (); bool removable () const; + const std::string& origin() const { return _origin; } + static PBD::Signal3<int,std::string,std::string,std::vector<std::string> > AmbiguousFileName; protected: FileSource (Session& session, DataType type, - const std::string& path, - Source::Flag flags = Source::Flag(0)); + const std::string& path, + const std::string& origin, + Source::Flag flags = Source::Flag(0)); FileSource (Session& session, const XMLNode& node, bool must_exist); @@ -92,9 +95,10 @@ protected: std::string _path; std::string _take_id; - bool _file_is_new; - uint16_t _channel; - bool _within_session; + bool _file_is_new; + uint16_t _channel; + bool _within_session; + std::string _origin; }; } // namespace ARDOUR diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h index ae2cba449a..ff15608d70 100644 --- a/libs/ardour/ardour/sndfilesource.h +++ b/libs/ardour/ardour/sndfilesource.h @@ -31,10 +31,10 @@ namespace ARDOUR { class SndFileSource : public AudioFileSource { public: /** Constructor to be called for existing external-to-session files */ - SndFileSource (Session&, const std::string& path, int chn, Flag flags); + SndFileSource (Session&, const std::string& path, int chn, Flag flags); /* Constructor to be called for new in-session files */ - SndFileSource (Session&, const std::string& path, + SndFileSource (Session&, const std::string& path, const std::string& origin, SampleFormat samp_format, HeaderFormat hdr_format, nframes_t rate, Flag flags = SndFileSource::default_writable_flags); diff --git a/libs/ardour/ardour/source_factory.h b/libs/ardour/ardour/source_factory.h index 14d0de5f4d..c59dab9223 100644 --- a/libs/ardour/ardour/source_factory.h +++ b/libs/ardour/ardour/source_factory.h @@ -48,7 +48,7 @@ class SourceFactory { int chn, Source::Flag flags, bool announce = true, bool async = false); static boost::shared_ptr<Source> createWritable (DataType type, Session&, - const std::string& path, + const std::string& path, const std::string& origin, bool destructive, nframes_t rate, bool announce = true, bool async = false); static Glib::Cond* PeaksToBuild; |