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/add_route_dialog.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/add_route_dialog.cc')
| -rw-r--r-- | gtk2_ardour/add_route_dialog.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc index a828caeb92..a3d3deaea5 100644 --- a/gtk2_ardour/add_route_dialog.cc +++ b/gtk2_ardour/add_route_dialog.cc @@ -61,13 +61,14 @@ std::vector<std::string> AddRouteDialog::channel_combo_strings; std::vector<std::string> AddRouteDialog::track_mode_strings; std::vector<std::string> AddRouteDialog::bus_mode_strings; -AddRouteDialog::AddRouteDialog (Session & s) +AddRouteDialog::AddRouteDialog (Session* s) : ArdourDialog (X_("add route dialog")) - , _session (s) , routes_adjustment (1, 1, 128, 1, 4) , routes_spinner (routes_adjustment) , mode_label (_("Track mode:")) { + set_session (s); + if (track_mode_strings.empty()) { track_mode_strings = I18N (track_mode_names); @@ -391,7 +392,7 @@ AddRouteDialog::route_group () return 0; } - return _session.route_group_by_name (route_group_combo.get_active_text()); + return _session->route_group_by_name (route_group_combo.get_active_text()); } void @@ -404,7 +405,7 @@ AddRouteDialog::refill_route_groups () route_group_combo.append_text (_("No group")); - _session.foreach_route_group (sigc::mem_fun (*this, &AddRouteDialog::add_route_group)); + _session->foreach_route_group (sigc::mem_fun (*this, &AddRouteDialog::add_route_group)); route_group_combo.set_active (2); } @@ -412,14 +413,14 @@ AddRouteDialog::refill_route_groups () void AddRouteDialog::group_changed () { - if (route_group_combo.get_active_text () == _("New group...")) { - RouteGroup* g = new RouteGroup (_session, "", RouteGroup::Active); + if (_session && route_group_combo.get_active_text () == _("New group...")) { + RouteGroup* g = new RouteGroup (*_session, "", RouteGroup::Active); 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); add_route_group (g); route_group_combo.set_active (3); } else { |