diff options
| author | Carl Hetherington <carl@carlh.net> | 2007-10-19 13:30:07 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2007-10-19 13:30:07 +0000 |
| commit | 77f16522e0b396262bc272c1637753faa9da0ba7 (patch) | |
| tree | 54520a9d20bc61e72cfdf8c162eb9ed07b95e99d /libs/ardour/ardour/session.h | |
| parent | 239ec39da6583e6e00cd03fa3bde8f1e27016b4d (diff) | |
Various work on bundles. We now have a Bundle Manager dialogue, and hopefully things are a bit cleaner internally. This commit changes the session file format with respect to bundles (or Connections as they used to be called).
git-svn-id: svn://localhost/ardour2/trunk@2561 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/session.h')
| -rw-r--r-- | libs/ardour/ardour/session.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index bbcae6e91d..e153914a09 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -489,7 +489,8 @@ class Session : public PBD::StatefulDestructible void set_remote_control_ids(); - AudioEngine &engine() { return _engine; }; + AudioEngine & engine() { return _engine; } + AudioEngine const & engine () const { return _engine; } int32_t max_level; int32_t min_level; @@ -716,7 +717,6 @@ class Session : public PBD::StatefulDestructible void add_bundle (boost::shared_ptr<Bundle>); void remove_bundle (boost::shared_ptr<Bundle>); boost::shared_ptr<Bundle> bundle_by_name (string) const; - boost::shared_ptr<Bundle> bundle_by_ports (vector<string> const &) const; sigc::signal<void,boost::shared_ptr<Bundle> > BundleAdded; sigc::signal<void,boost::shared_ptr<Bundle> > BundleRemoved; @@ -1564,7 +1564,8 @@ class Session : public PBD::StatefulDestructible typedef list<boost::shared_ptr<Bundle> > BundleList; mutable Glib::Mutex bundle_lock; BundleList _bundles; - int load_bundles (const XMLNode&); + XMLNode* _bundle_xml_node; + int load_bundles (XMLNode const &); void reverse_diskstream_buffers (); |