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, 93 insertions, 93 deletions

diff --git a/libs/ardour/export_format_specification.cc b/libs/ardour/export_format_specification.cc
index ab05aa4a64..60a7732b58 100644
--- a/libs/ardour/export_format_specification.cc
+++ b/libs/ardour/export_format_specification.cc
@@ -45,29 +45,29 @@ ExportFormatSpecification::Time::operator= (AnyTime const & other)
 	type = other.type;
 	smpte = other.smpte;
 	bbt = other.bbt;
-	
+
 	if (type == Frames) {
 		frames = other.frames;
 	} else {
 		seconds = other.seconds;
 	}
-	
+
 	return *this;
 }
 
 nframes_t
 ExportFormatSpecification::Time::get_frames (nframes_t target_rate) const
-{	
+{
 	//TODO position
 	nframes_t duration = session.convert_to_frames_at (0, *this);
-	
+
 	return ((double) target_rate / session.frame_rate()) * duration + 0.5;
 }
 
 XMLNode &
 ExportFormatSpecification::Time::get_state ()
 {
-	
+
 	XMLNode * node = new XMLNode ("Duration");
 
 	node->add_property ("format", enum_2_string (type));
@@ -91,7 +91,7 @@ ExportFormatSpecification::Time::get_state ()
 		node->add_property ("seconds", to_string (seconds, std::dec));
 		break;
 	}
-	
+
 	return *node;
 }
 
@@ -99,61 +99,61 @@ int
 ExportFormatSpecification::Time::set_state (const XMLNode & node)
 {
 	XMLProperty const * prop;
-	
+
 	prop = node.property ("format");
-	
+
 	if (!prop) { return -1; }
-	
+
 	type = (Type) string_2_enum (prop->value(), Type);
-	
+
 	switch (type) {
 	  case SMPTE:
 		if ((prop = node.property ("hours"))) {
 			smpte.hours = atoi (prop->value());
 		}
-		
+
 		if ((prop = node.property ("minutes"))) {
 			smpte.minutes = atoi (prop->value());
 		}
-		
+
 		if ((prop = node.property ("seconds"))) {
 			smpte.seconds = atoi (prop->value());
 		}
-		
+
 		if ((prop = node.property ("frames"))) {
 			smpte.frames = atoi (prop->value());
 		}
-		
+
 		break;
-	
+
 	  case BBT:
 		if ((prop = node.property ("bars"))) {
 			bbt.bars = atoi (prop->value());
 		}
-		
+
 		if ((prop = node.property ("beats"))) {
 			bbt.beats = atoi (prop->value());
 		}
-		
+
 		if ((prop = node.property ("ticks"))) {
 			bbt.ticks = atoi (prop->value());
 		}
-	
+
 		break;
-	
+
 	  case Frames:
 		if ((prop = node.property ("frames"))) {
 			std::istringstream iss (prop->value());
 			iss >> frames;
 		}
-		
+
 		break;
-		
+
 	  case Seconds:
 		if ((prop = node.property ("seconds"))) {
 			seconds = atof (prop->value());
 		}
-		
+
 		break;
 	}
 
@@ -162,7 +162,7 @@ ExportFormatSpecification::Time::set_state (const XMLNode & node)
 
 ExportFormatSpecification::ExportFormatSpecification (Session & s)
 	: session (s)
-	
+
 	, has_sample_format (false)
 	, supports_tagging (false)
 	, _has_broadcast_info (false)
@@ -170,12 +170,12 @@ ExportFormatSpecification::ExportFormatSpecification (Session & s)
 	, _dither_type (D_None)
 	, _src_quality (SRC_SincBest)
 	, _tag (true)
-	
+
 	, _trim_beginning (false)
 	, _silence_beginning (s)
 	, _trim_end (false)
 	, _silence_end (s)
-	
+
 	, _normalize (false)
 	, _normalize_target (1.0)
 {
@@ -207,7 +207,7 @@ ExportFormatSpecification::ExportFormatSpecification (ExportFormatSpecification
 
 	_format_name = other._format_name;
 	has_sample_format = other.has_sample_format;
-	
+
 	supports_tagging = other.supports_tagging;
 	_has_broadcast_info = other._has_broadcast_info;
 	_channel_limit = other._channel_limit;
@@ -218,16 +218,16 @@ ExportFormatSpecification::ExportFormatSpecification (ExportFormatSpecification
 	set_sample_format (other.sample_format());
 	set_sample_rate (other.sample_rate());
 	set_quality (other.quality());
-	
+
 	set_dither_type (other.dither_type());
 	set_src_quality (other.src_quality());
 	set_trim_beginning (other.trim_beginning());
 	set_trim_end (other.trim_end());
 	set_normalize (other.normalize());
 	set_normalize_target (other.normalize_target());
-	
+
 	set_tag (other.tag());
-	
+
 	set_silence_beginning (other.silence_beginning_time());
 	set_silence_end (other.silence_end_time());
 }
@@ -241,10 +241,10 @@ ExportFormatSpecification::get_state ()
 {
 	XMLNode * node;
 	XMLNode * root = new XMLNode ("ExportFormatSpecification");
-	
+
 	root->add_property ("name", _name);
 	root->add_property ("id", _id.to_s());
-	
+
 	node = root->add_child ("Encoding");
 	node->add_property ("id", enum_2_string (format_id()));
 	node->add_property ("type", enum_2_string (type()));
@@ -252,45 +252,45 @@ ExportFormatSpecification::get_state ()
 	node->add_property ("name", _format_name);
 	node->add_property ("has-sample-format", has_sample_format ? "true" : "false");
 	node->add_property ("channel-limit", to_string (_channel_limit, std::dec));
-	
+
 	node = root->add_child ("SampleRate");
 	node->add_property ("rate", to_string (sample_rate(), std::dec));
-	
+
 	node = root->add_child ("SRCQuality");
 	node->add_property ("quality", enum_2_string (src_quality()));
-	
+
 	XMLNode * enc_opts = root->add_child ("EncodingOptions");
-	
+
 	add_option (enc_opts, "sample-format", enum_2_string (sample_format()));
 	add_option (enc_opts, "dithering", enum_2_string (dither_type()));
 	add_option (enc_opts, "tag-metadata", _tag ? "true" : "false");
 	add_option (enc_opts, "tag-support", supports_tagging ? "true" : "false");
 	add_option (enc_opts, "broadcast-info", _has_broadcast_info ? "true" : "false");
-	
+
 	XMLNode * processing = root->add_child ("Processing");
-	
+
 	node = processing->add_child ("Normalize");
 	node->add_property ("enabled", normalize() ? "true" : "false");
 	node->add_property ("target", to_string (normalize_target(), std::dec));
-	
+
 	XMLNode * silence = processing->add_child ("Silence");
 	XMLNode * start = silence->add_child ("Start");
 	XMLNode * end = silence->add_child ("End");
-	
+
 	node = start->add_child ("Trim");
 	node->add_property ("enabled", trim_beginning() ? "true" : "false");
-	
+
 	node = start->add_child ("Add");
 	node->add_property ("enabled", silence_beginning() > 0 ? "true" : "false");
 	node->add_child_nocopy (_silence_beginning.get_state());
-	
+
 	node = end->add_child ("Trim");
 	node->add_property ("enabled", trim_end() ? "true" : "false");
-	
+
 	node = end->add_child ("Add");
 	node->add_property ("enabled", silence_end() > 0 ? "true" : "false");
 	node->add_child_nocopy (_silence_end.get_state());
-	
+
 	return *root;
 }
 
@@ -300,57 +300,57 @@ ExportFormatSpecification::set_state (const XMLNode & root)
 	XMLProperty const * prop;
 	XMLNode const * child;
 	string value;
-	
+
 	if ((prop = root.property ("name"))) {
 		_name = prop->value();
 	}
-	
+
 	if ((prop = root.property ("id"))) {
 		_id = prop->value();
 	}
-	
+
 	/* Encoding and SRC */
-	
+
 	if ((child = root.child ("Encoding"))) {
 		if ((prop = child->property ("id"))) {
 			set_format_id ((FormatId) string_2_enum (prop->value(), FormatId));
 		}
-		
+
 		if ((prop = child->property ("type"))) {
 			set_type ((Type) string_2_enum (prop->value(), Type));
 		}
-		
+
 		if ((prop = child->property ("extension"))) {
 			set_extension (prop->value());
 		}
-		
+
 		if ((prop = child->property ("name"))) {
 			_format_name = prop->value();
 		}
-		
+
 		if ((prop = child->property ("has-sample-format"))) {
 			has_sample_format = !prop->value().compare ("true");
 		}
-		
+
 		if ((prop = child->property ("channel-limit"))) {
 			_channel_limit = atoi (prop->value());
 		}
 	}
-	
+
 	if ((child = root.child ("SampleRate"))) {
 		if ((prop = child->property ("rate"))) {
 			set_sample_rate ( (SampleRate) string_2_enum (prop->value(), SampleRate));
 		}
 	}
-	
+
 	if ((child = root.child ("SRCQuality"))) {
 		if ((prop = child->property ("quality"))) {
 			_src_quality = (SRCQuality) string_2_enum (prop->value(), SRCQuality);
 		}
 	}
-	
+
 	/* Encoding options */
-	
+
 	if ((child = root.child ("EncodingOptions"))) {
 		set_sample_format ((SampleFormat) string_2_enum (get_option (child, "sample-format"), SampleFormat));
 		set_dither_type ((DitherType) string_2_enum (get_option (child, "dithering"), DitherType));
@@ -358,37 +358,37 @@ ExportFormatSpecification::set_state (const XMLNode & root)
 		supports_tagging = (!(get_option (child, "tag-support").compare ("true")));
 		_has_broadcast_info = (!(get_option (child, "broadcast-info").compare ("true")));
 	}
-	
+
 	/* Processing */
-	
+
 	XMLNode const * proc = root.child ("Processing");
 	if (!proc) { std::cerr << X_("Could not load processing for export format") << std::endl; return -1; }
-	
+
 	if ((child = proc->child ("Normalize"))) {
 		if ((prop = child->property ("enabled"))) {
 			_normalize = (!prop->value().compare ("true"));
 		}
-		
+
 		if ((prop = child->property ("target"))) {
 			_normalize_target = atof (prop->value());
 		}
 	}
-	
+
 	XMLNode const * silence = proc->child ("Silence");
 	if (!silence) { std::cerr << X_("Could not load silence for export format") << std::endl; return -1; }
-	
+
 	XMLNode const * start = silence->child ("Start");
 	XMLNode const * end = silence->child ("End");
 	if (!start || !end) { std::cerr << X_("Could not load end or start silence for export format") << std::endl; return -1; }
-	
+
 	/* Silence start */
-	
+
 	if ((child = start->child ("Trim"))) {
 		if ((prop = child->property ("enabled"))) {
 			_trim_beginning = (!prop->value().compare ("true"));
 		}
 	}
-	
+
 	if ((child = start->child ("Add"))) {
 		if ((prop = child->property ("enabled"))) {
 			if (!prop->value().compare ("true")) {
@@ -400,15 +400,15 @@ ExportFormatSpecification::set_state (const XMLNode & root)
 			}
 		}
 	}
-	
+
 	/* Silence end */
-	
+
 	if ((child = end->child ("Trim"))) {
 		if ((prop = child->property ("enabled"))) {
 			_trim_end = (!prop->value().compare ("true"));
 		}
 	}
-	
+
 	if ((child = end->child ("Add"))) {
 		if ((prop = child->property ("enabled"))) {
 			if (!prop->value().compare ("true")) {
@@ -420,7 +420,7 @@ ExportFormatSpecification::set_state (const XMLNode & root)
 			}
 		}
 	}
-	
+
 	return 0;
 }
 
@@ -428,27 +428,27 @@ bool
 ExportFormatSpecification::is_compatible_with (ExportFormatCompatibility const & compatibility) const
 {
 	boost::shared_ptr<ExportFormatBase> intersection = get_intersection (compatibility);
-	
+
 	if (intersection->formats_empty() && format_id() != 0) {
 		return false;
 	}
-	
+
 	if (intersection->endiannesses_empty() && endianness() != E_FileDefault) {
 		return false;
 	}
-	
+
 	if (intersection->sample_rates_empty() && sample_rate() != SR_None) {
 		return false;
 	}
-	
+
 	if (intersection->sample_formats_empty() && sample_format() != SF_None) {
 		return false;
 	}
-	
+
 	if (intersection->qualities_empty() && quality() != Q_None) {
 		return false;
 	}
-	
+
 	return true;
 }
 
@@ -458,15 +458,15 @@ ExportFormatSpecification::is_complete () const
 	if (type() == T_None) {
 		return false;
 	}
-	
+
 	if (!format_id()) {
 		return false;
 	}
-	
+
 	if (!sample_rate()) {
 		return false;
 	}
-	
+
 	if (has_sample_format) {
 		if (sample_format() == SF_None) {
 			return false;
@@ -483,22 +483,22 @@ ExportFormatSpecification::set_format (boost::shared_ptr<ExportFormat> format)
 		set_format_id (format->get_format_id ());
 		set_type (format->get_type());
 		set_extension (format->extension());
-		
+
 		if (format->get_explicit_sample_format()) {
 			set_sample_format (format->get_explicit_sample_format());
 		}
-		
+
 		if (format->has_sample_format()) {
 			has_sample_format = true;
 		}
-		
+
 		if (format->has_broadcast_info()) {
 			_has_broadcast_info = true;
 		}
-		
+
 		supports_tagging = format->supports_tagging ();
 		_channel_limit = format->get_channel_limit();
-		
+
 		_format_name = format->name();
 	} else {
 		set_format_id (F_None);
@@ -516,13 +516,13 @@ Glib::ustring
 ExportFormatSpecification::description ()
 {
 	Glib::ustring desc;
-	
+
 	desc = _name + ": ";
-	
+
 	if (_normalize) {
 		desc += _("normalize, ");
 	}
-	
+
 	if (_trim_beginning && _trim_end) {
 		desc += _("trim, ");
 	} else if (_trim_beginning) {
@@ -530,13 +530,13 @@ ExportFormatSpecification::description ()
 	} else if (_trim_end) {
 		desc += "trim end, ";
 	}
-	
+
 	desc += _format_name + ", ";
-	
+
 	if (has_sample_format) {
 		desc += HasSampleFormat::get_sample_format_name (sample_format())  + ", ";
 	}
-	
+
 	switch (sample_rate()) {
 	  case SR_22_05:
 		desc += "22,5 kHz";
@@ -559,7 +559,7 @@ ExportFormatSpecification::description ()
 	  case SR_None:
 		break;
 	}
-	
+
 	return desc;
 }
 
@@ -575,7 +575,7 @@ std::string
 ExportFormatSpecification::get_option (XMLNode const * node, std::string const & name)
 {
 	XMLNodeList list (node->children ("Option"));
-	
+
 	for (XMLNodeList::iterator it = list.begin(); it != list.end(); ++it) {
 		XMLProperty * prop = (*it)->property ("name");
 		if (prop && !name.compare (prop->value())) {
@@ -585,9 +585,9 @@ ExportFormatSpecification::get_option (XMLNode const * node, std::string const &
 			}
 		}
 	}
-	
+
 	std::cerr << "Could not load encoding option \"" << name << "\" for export format" << std::endl;
-	
+
 	return "";
 }