diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-02 11:32:13 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-02 11:32:13 -0400 |
| commit | 8c9749e42faf7808034ed8b7afce4a2fe6dc6f33 (patch) | |
| tree | 823af8a96f4e0b2a404f5e52eadf4f46e1d10229 /libs/ardour/ardour/smf_source.h | |
| parent | f6d29abfc75c460b9e35717f2907e4e61bf38058 (diff) | |
| parent | 08a1409b1f5b5558d2eccc28a3ae4cbd44391812 (diff) | |
merge with master and fix 4 conflicts by hand
Diffstat (limited to 'libs/ardour/ardour/smf_source.h')
| -rw-r--r-- | libs/ardour/ardour/smf_source.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h index 9d85f94352..44d965a4f6 100644 --- a/libs/ardour/ardour/smf_source.h +++ b/libs/ardour/ardour/smf_source.h @@ -36,9 +36,11 @@ template<typename T> class MidiRingBuffer; /** Standard Midi File (Type 0) Source */ class LIBARDOUR_API SMFSource : public MidiSource, public FileSource, public Evoral::SMF { public: + /** Constructor for new internal-to-session files */ + SMFSource (Session& session, const std::string& path, Source::Flag flags); + /** Constructor for existing external-to-session files */ - SMFSource (Session& session, const std::string& path, - Source::Flag flags = Source::Flag(0)); + SMFSource (Session& session, const std::string& path); /** Constructor for existing in-session files */ SMFSource (Session& session, const XMLNode&, bool must_exist = false); @@ -75,6 +77,9 @@ public: void ensure_disk_file (); static bool safe_midi_file_extension (const std::string& path); + static bool valid_midi_file (const std::string& path); + + void prevent_deletion (); void prevent_deletion (); |