smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 06:44:57 +01:00
Code Issues Projects Releases Wiki Activity

Clean up and comment PortMatrix event handling a bit.

Browse source 
Fix problems with attempts to access Session after it has been
destroyed.


git-svn-id: svn://localhost/ardour2/branches/3.0@6290 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-12-05 03:04:54 +00:00
parent bdf5dead24
commit abd80d0f64
18 changed files with 130 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gtk2_ardour/bundle_manager.cc
View file

@ -35,7 +35,7 @@ using namespace std;
using namespace ARDOUR;
BundleEditorMatrix::BundleEditorMatrix (
Gtk::Window* parent, Session& session, boost::shared_ptr<Bundle> bundle
Gtk::Window* parent, Session* session, boost::shared_ptr<Bundle> bundle
)
: PortMatrix (parent, session, bundle->type()),
_bundle (bundle)
@ -174,7 +174,7 @@ BundleEditorMatrix::list_is_global (int dim) const
return (dim == OTHER);
}
BundleEditor::BundleEditor (Session& session, boost::shared_ptr<UserBundle> bundle)
BundleEditor::BundleEditor (Session* session, boost::shared_ptr<UserBundle> bundle)
: ArdourDialog (_("Edit Bundle")), _matrix (this, session, bundle), _bundle (bundle)
{
Gtk::Table* t = new Gtk::Table (3, 2);
@ -284,7 +284,7 @@ BundleEditor::on_map ()
}
BundleManager::BundleManager (Session& session)
BundleManager::BundleManager (Session* session)
: ArdourDialog (_("Bundle Manager")), _session (session), edit_button (_("Edit")), delete_button (_("Delete"))
{
_list_model = Gtk::ListStore::create (_list_model_columns);
@ -292,7 +292,7 @@ BundleManager::BundleManager (Session& session)
_tree_view.append_column (_("Name"), _list_model_columns.name);
_tree_view.set_headers_visible (false);
boost::shared_ptr<BundleList> bundles = _session.bundles ();
boost::shared_ptr<BundleList> bundles = _session->bundles ();
for (BundleList::iterator i = bundles->begin(); i != bundles->end(); ++i) {
add_bundle (*i);
}
@ -352,7 +352,7 @@ BundleManager::new_clicked ()
/* Start off with a single channel */
b->add_channel ("1");
_session.add_bundle (b);
_session->add_bundle (b);
add_bundle (b);
BundleEditor e (_session, b);
@ -376,7 +376,7 @@ BundleManager::delete_clicked ()
Gtk::TreeModel::iterator i = _tree_view.get_selection()->get_selected();
if (i) {
boost::shared_ptr<UserBundle> b = (*i)[_list_model_columns.bundle];
_session.remove_bundle (b);
_session->remove_bundle (b);
_list_model->erase (i);
}
}