Create the session range location as and when the session first gets some content...

[ardour.git] / gtk2_ardour / add_route_dialog.cc

diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index a828caeb92b8c58ee5d0c07d1b73e173432c68ba..e7ae4454aa2bfae89ff31c406e7e320bb831c011 100644 (file)
--- 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)
-       : ArdourDialog (X_("add route dialog"))
-       , _session (s)
+AddRouteDialog::AddRouteDialog (Session* s)
+       : ArdourDialog (_("Add Track or Bus"))
        , 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);
 
@@ -90,8 +91,6 @@ AddRouteDialog::AddRouteDialog (Session & s)
        set_skip_taskbar_hint (true);
        set_resizable (false);
 
-       set_title (_("Add Track/Bus"));
-
        name_template_entry.set_name (X_("AddRouteDialogNameTemplateEntry"));
        routes_spinner.set_name (X_("AddRouteDialogSpinner"));
        channel_combo.set_name (X_("ChannelCountSelector"));
@@ -365,7 +364,7 @@ AddRouteDialog::refill_channel_setups ()
                chn.channels = 12;
                channel_setups.push_back (chn);
 
-               chn.name = X_("Custom");
+               chn.name = _("Custom");
                chn.channels = 0;
                channel_setups.push_back (chn);
        }
@@ -391,7 +390,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 +403,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 +411,18 @@ 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, "");
+
+               PropertyList plist;
+               plist.add (Properties::active, true);
+               g->set_properties (plist);
 
                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 {