diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-17 18:24:23 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-17 18:24:23 +0000 |
| commit | f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe (patch) | |
| tree | 5214c580b9e6c17a499fa587660dbf949e892bf2 /gtk2_ardour/route_group_menu.cc | |
| parent | da762129f19c28aff64f833b6ec09fba946faef6 (diff) | |
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash
git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/route_group_menu.cc')
| -rw-r--r-- | gtk2_ardour/route_group_menu.cc | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/gtk2_ardour/route_group_menu.cc b/gtk2_ardour/route_group_menu.cc index 08d2312415..7e05c26fe3 100644 --- a/gtk2_ardour/route_group_menu.cc +++ b/gtk2_ardour/route_group_menu.cc @@ -28,9 +28,9 @@ using namespace Gtk; using namespace ARDOUR; -RouteGroupMenu::RouteGroupMenu (Session& s, RouteGroup::Property p) - : _session (s), - _default_properties (p) +RouteGroupMenu::RouteGroupMenu (Session* s, RouteGroup::Property p) + : SessionHandlePtr (s) + , _default_properties (p) { rebuild (0); } @@ -52,7 +52,9 @@ RouteGroupMenu::rebuild (RouteGroup* curr) static_cast<RadioMenuItem*> (&items().back())->set_active (); } - _session.foreach_route_group (sigc::bind (sigc::mem_fun (*this, &RouteGroupMenu::add_item), curr, &group)); + if (_session) { + _session->foreach_route_group (sigc::bind (sigc::mem_fun (*this, &RouteGroupMenu::add_item), curr, &group)); + } } void @@ -76,13 +78,17 @@ RouteGroupMenu::set_group (RouteGroup* g) void RouteGroupMenu::new_group () { - RouteGroup* g = new RouteGroup (_session, "", RouteGroup::Active, _default_properties); + if (!_session) { + return; + } + + RouteGroup* g = new RouteGroup (*_session, "", RouteGroup::Active, _default_properties); RouteGroupDialog d (g, Gtk::Stock::NEW); int const r = d.do_run (); if (r == Gtk::RESPONSE_OK) { - _session.add_route_group (g); + _session->add_route_group (g); set_group (g); } else { delete g; |