Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only.

Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red.  I don't know the emacs equivalent...


git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 89 insertions, 89 deletions

diff --git a/gtk2_ardour/export_channel_selector.cc b/gtk2_ardour/export_channel_selector.cc
index 7b665a6087..c0205fa201 100644
--- a/gtk2_ardour/export_channel_selector.cc
+++ b/gtk2_ardour/export_channel_selector.cc
@@ -51,38 +51,38 @@ PortExportChannelSelector::PortExportChannelSelector (ARDOUR::Session * session,
 {
 	channels_hbox.pack_start (channels_label, false, false, 0);
 	channels_hbox.pack_end (channels_spinbutton, false, false, 0);
-	
+
 	channels_vbox.pack_start (channels_hbox, false, false, 0);
 	channels_vbox.pack_start (split_checkbox, false, false, 6);
-	
+
 	channel_alignment.add (channel_scroller);
 	channel_alignment.set_padding (0, 0, 12, 0);
 	channel_scroller.add (channel_view);
 	channel_scroller.set_size_request (-1, 130);
 	channel_scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
-	
+
 	pack_start (channels_vbox, false, false, 0);
 	pack_start (channel_alignment, true, true, 0);
-	
+
 	/* Channels spinbutton */
-	
+
 	channels_spinbutton.set_digits (0);
 	channels_spinbutton.set_increments (1, 2);
 	channels_spinbutton.set_range (1, max_channels);
 	channels_spinbutton.set_value (2);
-	
+
 	channels_spinbutton.signal_value_changed().connect (sigc::mem_fun (*this, &PortExportChannelSelector::update_channel_count));
-	
+
 	/* Other signals */
-	
+
 	split_checkbox.signal_toggled().connect (sigc::mem_fun (*this, &PortExportChannelSelector::update_split_state));
 	channel_view.CriticalSelectionChanged.connect (CriticalSelectionChanged.make_slot());
-	
+
 	/* Finalize */
-	
+
 	sync_with_manager();
 	show_all_children ();
-	
+
 }
 
 PortExportChannelSelector::~PortExportChannelSelector ()
@@ -96,10 +96,10 @@ void
 PortExportChannelSelector::sync_with_manager ()
 {
 	state = manager->get_channel_configs().front();
-	
+
 	split_checkbox.set_active (state->config->get_split());
 	channels_spinbutton.set_value (state->config->get_n_chans());
-	
+
 	fill_route_list ();
 	channel_view.set_config (state->config);
 }
@@ -111,17 +111,17 @@ PortExportChannelSelector::fill_route_list ()
 	RouteList routes = *session->get_routes();
 
 	/* Add master bus and then everything else */
-	
+
 	ARDOUR::IO* master = session->master_out()->output().get();
 	channel_view.add_route (master);
-	
+
 	for (RouteList::iterator it = routes.begin(); it != routes.end(); ++it) {
 		if ((*it)->output().get() == master) {
 			continue;
 		}
 		channel_view.add_route ((*it)->output().get());
 	}
-	
+
 	update_channel_count ();
 }
 
@@ -158,12 +158,12 @@ PortExportChannelSelector::RouteCols::get_channel (uint32_t channel)
 	}
 
 	std::list<Channel>::iterator it = channels.begin();
-	
+
 	while (channel > 1) { // Channel count starts from one!
 		++it;
 		--channel;
 	}
-	
+
 	return *it;
 }
 
@@ -171,26 +171,26 @@ PortExportChannelSelector::ChannelTreeView::ChannelTreeView (uint32_t max_channe
   n_channels (0)
 {
 	/* Main columns */
-	
+
 	route_cols.add_channels (max_channels);
-	
+
 	route_list = Gtk::ListStore::create(route_cols);
 	set_model (route_list);
-	
+
 	/* Add column with toggle and text */
-	
+
 	append_column_editable (_("Bus or Track"), route_cols.selected);
-	
+
 	Gtk::CellRendererText* text_renderer = Gtk::manage (new Gtk::CellRendererText);
 	text_renderer->property_editable() = false;
-	
+
 	Gtk::TreeView::Column* column = get_column (0);
 	column->pack_start (*text_renderer);
 	column->add_attribute (text_renderer->property_text(), route_cols.name);
-	
+
 	Gtk::CellRendererToggle *toggle = dynamic_cast<Gtk::CellRendererToggle *>(get_column_cell_renderer (0));
 	toggle->signal_toggled().connect (mem_fun (*this, &PortExportChannelSelector::ChannelTreeView::update_toggle_selection));
-	
+
 	static_columns = get_columns().size();
 }
 
@@ -208,54 +208,54 @@ PortExportChannelSelector::ChannelTreeView::set_config (ChannelConfigPtr c)
 	uint32_t i = 1;
 	ExportChannelConfiguration::ChannelList chan_list = config->get_channels();
 	for (ExportChannelConfiguration::ChannelList::iterator c_it = chan_list.begin(); c_it != chan_list.end(); ++c_it) {
-	
+
 		for (Gtk::ListStore::Children::iterator r_it = route_list->children().begin(); r_it != route_list->children().end(); ++r_it) {
-			
+
 			ARDOUR::PortExportChannel * pec;
 			if (!(pec = dynamic_cast<ARDOUR::PortExportChannel *> (c_it->get()))) {
 				continue;
 			}
-			
+
 			Glib::RefPtr<Gtk::ListStore> port_list = r_it->get_value (route_cols.port_list_col);
 			std::set<AudioPort *> route_ports;
 			std::set<AudioPort *> intersection;
 			std::map<AudioPort *, ustring> port_labels;
-			
+
 			for (Gtk::ListStore::Children::const_iterator p_it = port_list->children().begin(); p_it != port_list->children().end(); ++p_it) {
 				route_ports.insert ((*p_it)->get_value (route_cols.port_cols.port));
 				port_labels.insert (std::pair<AudioPort*, ustring> ((*p_it)->get_value (route_cols.port_cols.port),
 				                                                    (*p_it)->get_value (route_cols.port_cols.label)));
 			}
-			
+
 			std::set_intersection (pec->get_ports().begin(), pec->get_ports().end(),
 			                       route_ports.begin(), route_ports.end(),
 			                       std::insert_iterator<std::set<AudioPort *> > (intersection, intersection.begin()));
-			
+
 			intersection.erase (0); // Remove "none" selection
-			
+
 			if (intersection.empty()) {
 				continue;
 			}
-			
+
 			if (!r_it->get_value (route_cols.selected)) {
 				r_it->set_value (route_cols.selected, true);
-				
+
 				/* Set previous channels (if any) to none */
-				
+
 				for (uint32_t chn = 1; chn < i; ++chn) {
 					r_it->set_value (route_cols.get_channel (chn).port, (AudioPort *) 0);
 					r_it->set_value (route_cols.get_channel (chn).label, ustring ("(none)"));
 				}
 			}
-			
+
 			AudioPort * port = *intersection.begin();
 			std::map<AudioPort *, ustring>::iterator label_it = port_labels.find (port);
 			ustring label = label_it != port_labels.end() ? label_it->second : "error";
-			
+
 			r_it->set_value (route_cols.get_channel (i).port, port);
 			r_it->set_value (route_cols.get_channel (i).label, label);
 		}
-		
+
 		++i;
 	}
 }
@@ -269,85 +269,85 @@ PortExportChannelSelector::ChannelTreeView::add_route (ARDOUR::IO * io)
 	row[route_cols.selected] = false;
 	row[route_cols.name] = io->name();
 	row[route_cols.io] = io;
-	
+
 	/* Initialize port list */
-	
+
 	Glib::RefPtr<Gtk::ListStore> port_list = Gtk::ListStore::create (route_cols.port_cols);
 	row[route_cols.port_list_col] = port_list;
-	
+
 	uint32_t outs = io->n_ports().n_audio();
 	for (uint32_t i = 0; i < outs; ++i) {
 		iter = port_list->append();
 		row = *iter;
-		
+
 		row[route_cols.port_cols.selected] = false;
 		row[route_cols.port_cols.port] = io->audio (i);
-		
+
 		std::ostringstream oss;
 		oss << "Out-" << (i + 1);
-		
+
 		row[route_cols.port_cols.label] = oss.str();
 	}
-	
+
 	iter = port_list->append();
 	row = *iter;
-	
+
 	row[route_cols.port_cols.selected] = false;
 	row[route_cols.port_cols.port] = 0;
 	row[route_cols.port_cols.label] = "(none)";
-	
+
 }
 
 void
 PortExportChannelSelector::ChannelTreeView::set_channel_count (uint32_t channels)
 {
 	int offset = channels - n_channels;
-	
+
 	while (offset > 0) {
 		++n_channels;
-	
+
 		std::ostringstream oss;
 		oss << n_channels;
-		
+
 		/* New column */
-		
-		Gtk::TreeView::Column* column = Gtk::manage (new Gtk::TreeView::Column (oss.str())); 
-		
+
+		Gtk::TreeView::Column* column = Gtk::manage (new Gtk::TreeView::Column (oss.str()));
+
 		Gtk::CellRendererCombo* combo_renderer = Gtk::manage (new Gtk::CellRendererCombo);
-		combo_renderer->property_text_column() = 2; 
+		combo_renderer->property_text_column() = 2;
 		column->pack_start (*combo_renderer);
-		
+
 		append_column (*column);
-		
+
 		column->add_attribute (combo_renderer->property_text(), route_cols.get_channel(n_channels).label);
 		column->add_attribute (combo_renderer->property_model(), route_cols.port_list_col);
 		column->add_attribute (combo_renderer->property_editable(), route_cols.selected);
-		
+
 		combo_renderer->signal_edited().connect (sigc::bind (sigc::mem_fun (*this, &PortExportChannelSelector::ChannelTreeView::update_selection_text), n_channels));
-		
+
 		/* put data into view */
-		
+
 		for (Gtk::ListStore::Children::iterator it = route_list->children().begin(); it != route_list->children().end(); ++it) {
 			Glib::ustring label = it->get_value(route_cols.selected) ? "(none)" : "";
 			it->set_value (route_cols.get_channel (n_channels).label, label);
 			it->set_value (route_cols.get_channel (n_channels).port, (AudioPort *) 0);
 		}
-		
+
 		/* set column width */
-		
+
 		get_column (static_columns + n_channels - 1)->set_min_width (80);
-		
+
 		--offset;
 	}
-	
+
 	while (offset < 0) {
 		--n_channels;
-		
+
 		remove_column (*get_column (n_channels + static_columns));
-		
+
 		++offset;
 	}
-	
+
 	update_config ();
 }
 
@@ -360,26 +360,26 @@ PortExportChannelSelector::ChannelTreeView::update_config ()
 	config->clear_channels();
 
 	for (uint32_t i = 1; i <= n_channels; ++i) {
-	
+
 		ExportChannelPtr channel (new PortExportChannel ());
 		PortExportChannel * pec = static_cast<PortExportChannel *> (channel.get());
-	
+
 		for (Gtk::ListStore::Children::iterator it = route_list->children().begin(); it != route_list->children().end(); ++it) {
 			Gtk::TreeModel::Row row = *it;
-			
+
 			if (!row[route_cols.selected]) {
 				continue;
 			}
-			
+
 			AudioPort * port = row[route_cols.get_channel (i).port];
 			if (port) {
 				pec->add_port (port);
 			}
 		}
-		
+
 		config->register_channel (channel);
 	}
-	
+
 	CriticalSelectionChanged ();
 }
 
@@ -388,31 +388,31 @@ PortExportChannelSelector::ChannelTreeView::update_toggle_selection (Glib::ustri
 {
 	Gtk::TreeModel::iterator iter = get_model ()->get_iter (path);
 	bool selected = iter->get_value (route_cols.selected);
-	
+
 	for (uint32_t i = 1; i <= n_channels; ++i) {
-	
+
 		if (!selected) {
 			iter->set_value (route_cols.get_channel (i).label, Glib::ustring (""));
 			continue;
 		}
-	
+
 		iter->set_value (route_cols.get_channel (i).label, Glib::ustring("(none)"));
 		iter->set_value (route_cols.get_channel (i).port, (AudioPort *) 0);
-			
+
 		Glib::RefPtr<Gtk::ListStore> port_list = iter->get_value (route_cols.port_list_col);
 		Gtk::ListStore::Children::iterator port_it;
 		uint32_t port_number = 1;
-		
+
 		for (port_it = port_list->children().begin(); port_it != port_list->children().end(); ++port_it) {
 			if (port_number == i) {
 				iter->set_value (route_cols.get_channel (i).label, (Glib::ustring) (*port_it)->get_value (route_cols.port_cols.label));
 				iter->set_value (route_cols.get_channel (i).port, (AudioPort *) (*port_it)->get_value (route_cols.port_cols.port));
 			}
-			
+
 			++port_number;
 		}
 	}
-	
+
 	update_config ();
 }
 
@@ -421,17 +421,17 @@ PortExportChannelSelector::ChannelTreeView::update_selection_text (Glib::ustring
 {
 	Gtk::TreeModel::iterator iter = get_model ()->get_iter (path);
 	iter->set_value (route_cols.get_channel (channel).label, new_text);
-	
+
 	Glib::RefPtr<Gtk::ListStore> port_list = iter->get_value (route_cols.port_list_col);
 	Gtk::ListStore::Children::iterator port_it;
-	
+
 	for (port_it = port_list->children().begin(); port_it != port_list->children().end(); ++port_it) {
 		Glib::ustring label = port_it->get_value (route_cols.port_cols.label);
 		if (label == new_text) {
 			iter->set_value (route_cols.get_channel (channel).port, (AudioPort *) (*port_it)[route_cols.port_cols.port]);
 		}
 	}
-	
+
 	update_config ();
 }
 
@@ -454,15 +454,15 @@ RegionExportChannelSelector::RegionExportChannelSelector (ARDOUR::Session * sess
 	raw_button.set_label (string_compose (_("Region contents without fades (channels: %1)"), region_chans));
 	raw_button.signal_toggled ().connect (sigc::mem_fun (*this, &RegionExportChannelSelector::handle_selection));
 	vbox.pack_start (raw_button);
-	
+
 	fades_button.set_label (string_compose (_("Region contents with fades (channels: %1)"), region_chans));
 	fades_button.signal_toggled ().connect (sigc::mem_fun (*this, &RegionExportChannelSelector::handle_selection));
 	vbox.pack_start (fades_button);
-	
+
 	processed_button.set_label (string_compose (_("Track output (channels: %1)"), track_chans));
 	processed_button.signal_toggled ().connect (sigc::mem_fun (*this, &RegionExportChannelSelector::handle_selection));
 	vbox.pack_start (processed_button);
-	
+
 	sync_with_manager();
 	vbox.show_all_children ();
 	show_all_children ();
@@ -483,7 +483,7 @@ RegionExportChannelSelector::handle_selection ()
 	}
 
 	state->config->clear_channels ();
-	
+
 	if (raw_button.get_active ()) {
 		factory.reset (new RegionExportChannelFactory (session, region, track, RegionExportChannelFactory::Raw));
 	} else if (fades_button.get_active ()) {
@@ -494,10 +494,10 @@ RegionExportChannelSelector::handle_selection ()
 		CriticalSelectionChanged ();
 		return;
 	}
-	
+
 	for (size_t chan = 0; chan < region_chans; ++chan) {
 		state->config->register_channel (factory->create (chan));
 	}
-	
+
 	CriticalSelectionChanged ();
 }