diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-13 20:43:28 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-13 20:43:28 +0000 |
commit | 8c4ce1e2ce35571aed5a686671431fdfffae7f8c (patch) | |
tree | 180a152d46b78d4f1022df83074f136c90c762e7 /libs/ardour/ardour | |
parent | c221b09560842b71773eee15972d87c222baf6a1 (diff) |
writable session patch, forward ported from 2.X
git-svn-id: svn://localhost/ardour2/branches/3.0@5770 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/file_source.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/session.h | 4 | ||||
-rw-r--r-- | libs/ardour/ardour/source.h | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/libs/ardour/ardour/file_source.h b/libs/ardour/ardour/file_source.h index fdf7473c63..82a54094ef 100644 --- a/libs/ardour/ardour/file_source.h +++ b/libs/ardour/ardour/file_source.h @@ -68,7 +68,7 @@ protected: virtual int move_dependents_to_trash() { return 0; } bool removable () const; - + Glib::ustring _path; Glib::ustring _take_id; bool _file_is_new; diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 7da21274e1..cdf6547674 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -248,7 +248,8 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable std::string raid_path () const; void set_snap_name (); - + + bool writable() const { return _writable; } void set_dirty (); void set_clean (); bool dirty() const { return _state_of_the_state & Dirty; } @@ -1041,6 +1042,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable float _meter_falloff; bool _non_soloed_outs_muted; uint32_t _listen_cnt; + bool _writable; void set_worst_io_latencies (); void set_worst_io_latencies_x (IOChange, void *) { diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h index d6c68edf90..a61af84ac8 100644 --- a/libs/ardour/ardour/source.h +++ b/libs/ardour/ardour/source.h @@ -79,7 +79,7 @@ class Source : public SessionObject, public boost::noncopyable int set_state (const XMLNode&); bool destructive() const { return (_flags & Destructive); } - bool writable () const { return _flags & Writable; } + bool writable () const { return (_flags & Writable); } virtual bool set_destructive (bool /*yn*/) { return false; } virtual bool length_mutable() const { return false; } @@ -128,6 +128,7 @@ class Source : public SessionObject, public boost::noncopyable private: uint32_t _in_use; + void fix_writable_flags (); }; } |