NO-OP: whitespace & scope

diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index 303596fdb8e5c638ef5a6dd2559e9e971212c1cf..6ab9af8032a5434dba2942de4083e82aa4bb52a4 100644 (file)
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -290,54 +290,53 @@ AddRouteDialog::trk_template_row_selected ()
        if (trk_template_chooser.get_selection()->count_selected_rows() > 0) {
                TreeIter iter = trk_template_chooser.get_selection()->get_selected();
 
-               if (iter) {
-                       string d = (*iter)[track_template_columns.description];
-                       trk_template_desc.get_buffer()->set_text (d);
+               if (!iter) {
+                       return;
+               }
 
-                       string n = (*iter)[track_template_columns.name];
-                       if ( n != _("Manual Configuration") ) {
+               string d = (*iter)[track_template_columns.description];
+               trk_template_desc.get_buffer()->set_text (d);
 
-                               trk_template_desc.set_sensitive(true);
-
-                               manual_label.set_sensitive(false);
-                               add_label.set_sensitive(false);
-                               type_label.set_sensitive(false);
-                               name_label.set_sensitive(false);
-                               group_label.set_sensitive(false);
-                               strict_io_label.set_sensitive(false);
-                               configuration_label.set_sensitive(false);
-                               mode_label.set_sensitive(false);
-
-                               routes_spinner.set_sensitive(false);
-                               track_bus_combo.set_sensitive(false);
-                               name_template_entry.set_sensitive(false);
-                               channel_combo.set_sensitive(false);
-                               mode_combo.set_sensitive(false);
-                               instrument_combo.set_sensitive(false);
-                               strict_io_combo.set_sensitive(false);
-                               route_group_combo.set_sensitive(false);
-                       } else {
-
-                               trk_template_desc.set_sensitive(false);
-
-                               manual_label.set_sensitive(true);
-                               add_label.set_sensitive(true);
-                               type_label.set_sensitive(true);
-                               name_label.set_sensitive(true);
-                               group_label.set_sensitive(true);
-                               strict_io_label.set_sensitive(true);
-
-                               track_bus_combo.set_sensitive(true);
-                               routes_spinner.set_sensitive(true);
-                               name_template_entry.set_sensitive(true);
-                               track_type_chosen();
-                       }
-               }
+               string n = (*iter)[track_template_columns.name];
+               if ( n != _("Manual Configuration") ) {
 
+                       trk_template_desc.set_sensitive(true);
 
-       }
+                       manual_label.set_sensitive(false);
+                       add_label.set_sensitive(false);
+                       type_label.set_sensitive(false);
+                       name_label.set_sensitive(false);
+                       group_label.set_sensitive(false);
+                       strict_io_label.set_sensitive(false);
+                       configuration_label.set_sensitive(false);
+                       mode_label.set_sensitive(false);
+
+                       routes_spinner.set_sensitive(false);
+                       track_bus_combo.set_sensitive(false);
+                       name_template_entry.set_sensitive(false);
+                       channel_combo.set_sensitive(false);
+                       mode_combo.set_sensitive(false);
+                       instrument_combo.set_sensitive(false);
+                       strict_io_combo.set_sensitive(false);
+                       route_group_combo.set_sensitive(false);
+
+               } else {
 
+                       trk_template_desc.set_sensitive(false);
 
+                       manual_label.set_sensitive(true);
+                       add_label.set_sensitive(true);
+                       type_label.set_sensitive(true);
+                       name_label.set_sensitive(true);
+                       group_label.set_sensitive(true);
+                       strict_io_label.set_sensitive(true);
+
+                       track_bus_combo.set_sensitive(true);
+                       routes_spinner.set_sensitive(true);
+                       name_template_entry.set_sensitive(true);
+                       track_type_chosen();
+               }
+       }
 }
 
 

diff --git a/gtk2_ardour/session_dialog.cc b/gtk2_ardour/session_dialog.cc
index f3b8eb65cacd8c2cfb569b386d80641483477282..2337d985c38d8a02574575ec9c63c0813c9bd41c 100644 (file)
--- a/gtk2_ardour/session_dialog.cc
+++ b/gtk2_ardour/session_dialog.cc
@@ -666,22 +666,22 @@ SessionDialog::setup_new_session_page ()
                Gtk::ScrolledWindow *template_scroller = manage (new Gtk::ScrolledWindow());
                template_scroller->set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
                template_scroller->add (template_chooser);
-       
+
                Gtk::ScrolledWindow *desc_scroller = manage (new Gtk::ScrolledWindow());
                desc_scroller->set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
                desc_scroller->add (template_desc);
 
-        template_hbox->pack_start (*template_scroller, true, true);
+               template_hbox->pack_start (*template_scroller, true, true);
 
-        template_desc_frame.set_name (X_("TextHighlightFrame"));
-        template_desc_frame.add (*desc_scroller);
+               template_desc_frame.set_name (X_("TextHighlightFrame"));
+               template_desc_frame.add (*desc_scroller);
                template_hbox->pack_start (template_desc_frame, true, true);
        }
 
        //template_desc is the textview that displays the currently selected template's description
        template_desc.set_editable (false);
        template_desc.set_wrap_mode (Gtk::WRAP_WORD);
-       template_desc.set_size_request(300,400);
+       template_desc.set_size_request (300,400);
        template_desc.set_name (X_("TextOnBackground"));
        template_desc.set_border_width (6);