Fix broken whitespace. I'd apologize for the compile times if it was my fault :D

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

1 files changed, 68 insertions, 68 deletions

diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 2db17f1e58..182b399877 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -550,7 +550,7 @@ Session::create (const string& mix_template, BusProfile* bus_profile)
 	/* set initial start + end point */
 
 	_state_of_the_state = Clean;
-        
+
         /* set up Master Out and Control Out if necessary */
 
         if (bus_profile) {
@@ -590,7 +590,7 @@ Session::create (const string& mix_template, BusProfile* bus_profile)
 					r->output()->ensure_io (count, false, this);
 				}
                                 r->set_remote_control_id (control_id);
-                                
+
                                 rl.push_back (r);
                         }
 
@@ -610,7 +610,7 @@ Session::create (const string& mix_template, BusProfile* bus_profile)
                         bus_profile->input_ac = AutoConnectOption (0);
                         bus_profile->output_ac = AutoConnectOption (0);
                 }
-                
+
                 Config->set_input_auto_connect (bus_profile->input_ac);
                 Config->set_output_auto_connect (bus_profile->output_ac);
         }
@@ -715,7 +715,7 @@ Session::jack_session_event (jack_session_event_t * event)
         if (event->type == JackSessionSaveTemplate)
         {
                 if (save_template( timebuf )) {
-                        event->flags = JackSessionSaveError; 
+                        event->flags = JackSessionSaveError;
                 } else {
                         string cmd ("ardour3 -P -U ");
                         cmd += event->client_uuid;
@@ -728,7 +728,7 @@ Session::jack_session_event (jack_session_event_t * event)
         else
         {
                 if (save_state (timebuf)) {
-                        event->flags = JackSessionSaveError; 
+                        event->flags = JackSessionSaveError;
                 } else {
                         sys::path xml_path (_session_dir->root_path());
                         xml_path /= legalize_for_path (timebuf) + statefile_suffix;
@@ -925,7 +925,7 @@ Session::load_state (string snapshot_name)
 		sscanf (prop->value().c_str(), "%d.%d.%d", &major, &minor, &micro);
 		Stateful::loading_state_version = (major * 1000) + minor;
 	}
-		
+
 	if (Stateful::loading_state_version < CURRENT_SESSION_FILE_VERSION) {
 
 		sys::path backup_path(_session_dir->root_path());
@@ -1070,7 +1070,7 @@ Session::state(bool full_state)
 						continue;
 					}
 				}
-				
+
 				child->add_child_nocopy (siter->second->get_state());
 			}
 		}
@@ -1088,7 +1088,7 @@ Session::state(bool full_state)
                                 child->add_child_nocopy (r->state ());
                         }
                 }
-		
+
 		RegionFactory::CompoundAssociations& cassocs (RegionFactory::compound_associations());
 
 		if (!cassocs.empty()) {
@@ -1103,7 +1103,7 @@ Session::state(bool full_state)
 				can->add_property (X_("original"), buf);
 				ca->add_child_nocopy (*can);
 			}
-		}  
+		}
 	}
 
 	if (full_state) {
@@ -1333,13 +1333,13 @@ Session::set_state (const XMLNode& node, int version)
 	} else if (playlists->load_unused (*this, *child)) {
 		goto out;
 	}
-	
+
 	if ((child = find_named_node (node, "CompoundAssociations")) != 0) {
 		if (load_compounds (*child)) {
 			goto out;
 		}
 	}
-	
+
 	if ((child = find_named_node (node, "NamedSelections")) != 0) {
 		if (load_named_selections (*child)) {
 			goto out;
@@ -1357,7 +1357,7 @@ Session::set_state (const XMLNode& node, int version)
 			_bundle_xml_node = new XMLNode (*child);
 		}
 	}
-	
+
 	if (version < 3000) {
 		if ((child = find_named_node (node, X_("DiskStreams"))) == 0) {
 			error << _("Session: XML state has no diskstreams section") << endmsg;
@@ -1378,16 +1378,16 @@ Session::set_state (const XMLNode& node, int version)
 	_diskstreams_2X.clear ();
 
 	if (version >= 3000) {
-		
+
 		if ((child = find_named_node (node, "RouteGroups")) == 0) {
 			error << _("Session: XML state has no route groups section") << endmsg;
 			goto out;
 		} else if (load_route_groups (*child, version)) {
 			goto out;
 		}
-		
+
 	} else if (version < 3000) {
-		
+
 		if ((child = find_named_node (node, "EditGroups")) == 0) {
 			error << _("Session: XML state has no edit groups section") << endmsg;
 			goto out;
@@ -1442,7 +1442,7 @@ Session::load_routes (const XMLNode& node, int version)
 		} else {
 			route = XMLRouteFactory (**niter, version);
 		}
-		
+
 		if (route == 0) {
 			error << _("Session: cannot create Route from XML description.") << endmsg;
 			return -1;
@@ -1481,26 +1481,26 @@ Session::XMLRouteFactory (const XMLNode& node, int version)
 	if (ds_child) {
 
 		boost::shared_ptr<Track> track;
-                
+
                 if (type == DataType::AUDIO) {
                         track.reset (new AudioTrack (*this, X_("toBeResetFroXML")));
                 } else {
                         track.reset (new MidiTrack (*this, X_("toBeResetFroXML")));
                 }
-                
+
                 if (track->init()) {
                         return ret;
                 }
-                
+
                 if (track->set_state (node, version)) {
                         return ret;
                 }
-                
+
 #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
                 boost_debug_shared_ptr_mark_interesting (track.get(), "Track");
 #endif
                 ret = track;
-                
+
 	} else {
 		boost::shared_ptr<Route> r (new Route (*this, X_("toBeResetFroXML")));
 
@@ -1557,22 +1557,22 @@ Session::XMLRouteFactory_2X (const XMLNode& node, int version)
                 } else {
                         track.reset (new MidiTrack (*this, X_("toBeResetFroXML")));
                 }
-                
+
                 if (track->init()) {
                         return ret;
                 }
-                
+
                 if (track->set_state (node, version)) {
                         return ret;
                 }
 
 		track->set_diskstream (*i);
-                
-#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS                
+
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
                 boost_debug_shared_ptr_mark_interesting (track.get(), "Track");
 #endif
                 ret = track;
-                
+
 	} else {
 		boost::shared_ptr<Route> r (new Route (*this, X_("toBeResetFroXML")));
 
@@ -1620,32 +1620,32 @@ Session::load_compounds (const XMLNode& node)
 	XMLNodeList calist = node.children();
 	XMLNodeConstIterator caiter;
 	XMLProperty *caprop;
-	
+
 	for (caiter = calist.begin(); caiter != calist.end(); ++caiter) {
 		XMLNode* ca = *caiter;
 		ID orig_id;
 		ID copy_id;
-		
+
 		if ((caprop = ca->property (X_("original"))) == 0) {
 			continue;
 		}
 		orig_id = caprop->value();
-		
+
 		if ((caprop = ca->property (X_("copy"))) == 0) {
 			continue;
 		}
 		copy_id = caprop->value();
-		
+
 		boost::shared_ptr<Region> orig = RegionFactory::region_by_id (orig_id);
 		boost::shared_ptr<Region> copy = RegionFactory::region_by_id (copy_id);
-		
+
 		if (!orig || !copy) {
 			warning << string_compose (_("Regions in compound description not found (ID's %1 and %2): ignored"),
-						   orig_id, copy_id) 
+						   orig_id, copy_id)
 				<< endmsg;
 			continue;
 		}
-		
+
 		RegionFactory::add_compound_association (orig, copy);
 	}
 
@@ -1664,7 +1664,7 @@ Session::load_nested_sources (const XMLNode& node)
 		if ((*niter)->name() == "Source") {
 			try {
 				SourceFactory::create (*this, **niter, true);
-			} 
+			}
 			catch (failed_constructor& err) {
 				error << string_compose (_("Cannot reconstruct nested source for region %1"), name()) << endmsg;
 			}
@@ -1680,7 +1680,7 @@ Session::XMLRegionFactory (const XMLNode& node, bool full)
 	try {
 
 		const XMLNodeList& nlist = node.children();
-		
+
 		for (XMLNodeConstIterator niter = nlist.begin(); niter != nlist.end(); ++niter) {
 			XMLNode *child = (*niter);
 			if (child->name() == "NestedSource") {
@@ -1961,8 +1961,8 @@ Session::load_sources (const XMLNode& node)
                         case 0:
                                 /* user added a new search location, so try again */
                                 goto retry;
-                                
-                                
+
+
                         case 1:
                                 /* user asked to quit the entire session load
                                  */
@@ -2287,7 +2287,7 @@ Session::load_route_groups (const XMLNode& node, int version)
 	set_dirty ();
 
 	if (version >= 3000) {
-		
+
 		for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
 			if ((*niter)->name() == "RouteGroup") {
 				RouteGroup* rg = new RouteGroup (*this, "");
@@ -2374,7 +2374,7 @@ Session::add_route_group (RouteGroup* g)
 
 	g->MembershipChanged.connect_same_thread (*this, boost::bind (&Session::route_group_changed, this));
 	g->PropertyChanged.connect_same_thread (*this, boost::bind (&Session::route_group_changed, this));
-	
+
 	set_dirty ();
 }
 
@@ -2448,14 +2448,14 @@ Session::begin_reversible_command (GQuark q)
 	   to hold all the commands that are committed.  This keeps the order of
 	   commands correct in the history.
 	*/
-	
+
 	if (_current_trans == 0) {
 		/* start a new transaction */
 		assert (_current_trans_quarks.empty ());
 		_current_trans = new UndoTransaction();
 		_current_trans->set_name (g_quark_to_string (q));
 	}
-	
+
 	_current_trans_quarks.push_front (q);
 }
 
@@ -2464,7 +2464,7 @@ Session::commit_reversible_command (Command *cmd)
 {
 	assert (_current_trans);
 	assert (!_current_trans_quarks.empty ());
-	
+
 	struct timeval now;
 
 	if (cmd) {
@@ -2494,7 +2494,7 @@ Session::commit_reversible_command (Command *cmd)
 
 static bool
 accept_all_audio_files (const string& path, void */*arg*/)
-{ 
+{
         if (!Glib::file_test (path, Glib::FILE_TEST_IS_REGULAR)) {
                 return false;
         }
@@ -2645,11 +2645,11 @@ Session::cleanup_regions ()
 	for (RegionFactory::RegionMap::const_iterator i = regions.begin(); i != regions.end(); ++i) {
 
 		boost::shared_ptr<AudioRegion> audio_region = boost::dynamic_pointer_cast<AudioRegion>( i->second);
-		
+
 		if (!audio_region) {
 			continue;
 		}
-		
+
 		uint32_t used = playlists->region_use_count (audio_region);
 
 		if (used == 0 && !audio_region->automatic()) {
@@ -2685,7 +2685,7 @@ Session::cleanup_sources (CleanupReport& rep)
 	_state_of_the_state = (StateOfTheState) (_state_of_the_state | InCleanup);
 
 	/* consider deleting all unused playlists */
-	
+
 	if (playlists->maybe_delete_unused (boost::bind (Session::ask_about_playlist_deletion, _1))) {
 		ret = 0;
 		goto out;
@@ -2790,13 +2790,13 @@ Session::cleanup_sources (CleanupReport& rep)
                         if (playlists->source_use_count (fs) != 0) {
                                 all_sources.insert (fs->path());
                         } else {
-                                
+
                                 /* we might not remove this source from disk, because it may be used
                                    by other snapshots, but its not being used in this version
                                    so lets get rid of it now, along with any representative regions
                                    in the region list.
                                 */
-                                
+
                                 RegionFactory::remove_regions_using_source (i->second);
                                 sources.erase (i);
                         }
@@ -2810,18 +2810,18 @@ Session::cleanup_sources (CleanupReport& rep)
 
         if (candidates) {
                 for (vector<string*>::iterator x = candidates->begin(); x != candidates->end(); ++x) {
-                        
+
                         used = false;
                         spath = **x;
-                        
+
                         for (set<string>::iterator i = all_sources.begin(); i != all_sources.end(); ++i) {
-                                
+
                                 if (realpath(spath.c_str(), tmppath1) == 0) {
                                         error << string_compose (_("Cannot expand path %1 (%2)"),
                                                                  spath, strerror (errno)) << endmsg;
                                         continue;
                                 }
-                                
+
                                 if (realpath((*i).c_str(),  tmppath2) == 0) {
                                         error << string_compose (_("Cannot expand path %1 (%2)"),
                                                                  (*i), strerror (errno)) << endmsg;
@@ -2833,7 +2833,7 @@ Session::cleanup_sources (CleanupReport& rep)
                                         break;
                                 }
                         }
-                        
+
                         if (!used) {
                                 unused.push_back (spath);
                         }
@@ -2881,7 +2881,7 @@ Session::cleanup_sources (CleanupReport& rep)
 		}
 
 		newpath = Glib::build_filename (newpath, Glib::path_get_basename ((*x)));
-                
+
 		if (Glib::file_test (newpath, Glib::FILE_TEST_EXISTS)) {
 
 			/* the new path already exists, try versioning */
@@ -2925,12 +2925,12 @@ Session::cleanup_sources (CleanupReport& rep)
 		 */
 
                 string base = basename_nosuffix (*x);
-                base += "%A"; /* this is what we add for the channel suffix of all native files, 
+                base += "%A"; /* this is what we add for the channel suffix of all native files,
                                  or for the first channel of embedded files. it will miss
                                  some peakfiles for other channels
                               */
 		string peakpath = peak_path (base);
-                
+
 		if (Glib::file_test (peakpath.c_str(), Glib::FILE_TEST_EXISTS)) {
 			if (::unlink (peakpath.c_str()) != 0) {
 				error << string_compose (_("cannot remove peakfile %1 for %2 (%3)"),
@@ -3092,7 +3092,7 @@ Session::controllable_by_descriptor (const ControllableDescriptor& desc)
 		r = route_by_remote_id (desc.rid());
 		break;
 	}
-	
+
 	if (!r) {
 		return c;
 	}
@@ -3113,7 +3113,7 @@ Session::controllable_by_descriptor (const ControllableDescriptor& desc)
 	case ControllableDescriptor::Recenable:
 	{
 		boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track>(r);
-		
+
 		if (t) {
 			c = t->rec_enable_control ();
 		}
@@ -3148,17 +3148,17 @@ Session::controllable_by_descriptor (const ControllableDescriptor& desc)
 		uint32_t parameter_index = desc.target (1);
 
 		/* revert to zero based counting */
-		
+
 		if (plugin > 0) {
 			--plugin;
 		}
-		
+
 		if (parameter_index > 0) {
 			--parameter_index;
 		}
 
 		boost::shared_ptr<Processor> p = r->nth_plugin (plugin);
-		
+
 		if (p) {
 			c = boost::dynamic_pointer_cast<ARDOUR::AutomationControl>(
 				p->control(Evoral::Parameter(PluginAutomation, 0, parameter_index)));
@@ -3166,18 +3166,18 @@ Session::controllable_by_descriptor (const ControllableDescriptor& desc)
 		break;
 	}
 
-	case ControllableDescriptor::SendGain: 
+	case ControllableDescriptor::SendGain:
 	{
 		uint32_t send = desc.target (0);
 
 		/* revert to zero-based counting */
-		
+
 		if (send > 0) {
 			--send;
 		}
-		
+
 		boost::shared_ptr<Processor> p = r->nth_send (send);
-		
+
 		if (p) {
 			boost::shared_ptr<Send> s = boost::dynamic_pointer_cast<Send>(p);
 			boost::shared_ptr<Amp> a = s->amp();
@@ -3348,7 +3348,7 @@ Session::restore_history (string snapshot_name)
 				} else {
 					error << _("Failed to downcast MidiSource for SysExDiffCommand") << endmsg;
 				}
-				
+
 			} else if (n->name() == "PatchChangeDiffCommand") {
 
 				PBD::ID id (n->property("midi-source")->value());
@@ -3605,7 +3605,7 @@ void
 Session::setup_midi_machine_control ()
 {
 	MIDI::MachineControl* mmc = MIDI::Manager::instance()->mmc ();
-	
+
 	mmc->Play.connect_same_thread (*this, boost::bind (&Session::mmc_deferred_play, this, _1));
 	mmc->DeferredPlay.connect_same_thread (*this, boost::bind (&Session::mmc_deferred_play, this, _1));
 	mmc->Stop.connect_same_thread (*this, boost::bind (&Session::mmc_stop, this, _1));
@@ -3638,6 +3638,6 @@ Session::solo_cut_control() const
            it up as a Controllable. Changes to the Controllable will just map back to the RCConfiguration
            parameter.
         */
-        
+
         return _solo_cut_control;
 }