X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_formats.cc;h=47f68fe4646b0161a5517c0a00d943854df610f2;hb=eaca325ce81c63888ee70305ad384102e46757be;hp=ef6bbe35bc614fc8fcd3ccd664baac522046a8e1;hpb=d166d0584f611d5e1ff85a5008e87c9e21e04952;p=ardour.git

diff --git a/libs/ardour/export_formats.cc b/libs/ardour/export_formats.cc
index ef6bbe35bc..47f68fe464 100644
--- a/libs/ardour/export_formats.cc
+++ b/libs/ardour/export_formats.cc
@@ -68,7 +68,7 @@ HasSampleFormat::add_sample_format (ExportFormatBase::SampleFormat format)
 }
 
 void
-HasSampleFormat::add_dither_type (ExportFormatBase::DitherType type, Glib::ustring name)
+HasSampleFormat::add_dither_type (ExportFormatBase::DitherType type, string name)
 {
 	DitherTypePtr ptr (new DitherTypeState (type, name));
 	dither_type_states.push_back (ptr);
@@ -156,19 +156,19 @@ HasSampleFormat::get_sample_format_name (ExportFormatBase::SampleFormat format)
 {
 	switch (format) {
 	  case ExportFormatBase::SF_8:
-		return _("8bit");
+		return _("8-bit");
 	  case ExportFormatBase::SF_16:
-		return _("16bit");
+		return _("16-bit");
 	  case ExportFormatBase::SF_24:
-		return _("24bit");
+		return _("24-bit");
 	  case ExportFormatBase::SF_32:
-		return _("32bit");
+		return _("32-bit");
 	  case ExportFormatBase::SF_Float:
 		return _("float");
 	  case ExportFormatBase::SF_Double:
 		return _("double");
 	  case ExportFormatBase::SF_U8:
-		return _("8bit unsigned");
+		return _("8-bit unsigned");
 	  case ExportFormatBase::SF_Vorbis:
 		return _("Vorbis sample format");
 	  case ExportFormatBase::SF_None:
@@ -179,19 +179,21 @@ HasSampleFormat::get_sample_format_name (ExportFormatBase::SampleFormat format)
 
 /*** Linear ***/
 
-ExportFormatLinear::ExportFormatLinear (Glib::ustring name, FormatId format_id) :
+ExportFormatLinear::ExportFormatLinear (string name, FormatId format_id) :
   HasSampleFormat (sample_formats),
   _default_sample_format (SF_None)
 {
 	set_name (name);
 	set_format_id (format_id);
 
+	add_sample_rate (SR_8);
 	add_sample_rate (SR_22_05);
 	add_sample_rate (SR_44_1);
 	add_sample_rate (SR_48);
 	add_sample_rate (SR_88_2);
 	add_sample_rate (SR_96);
 	add_sample_rate (SR_192);
+	add_sample_rate (SR_Session);
 
 	add_endianness (E_FileDefault);
 
@@ -262,6 +264,7 @@ ExportFormatOggVorbis::ExportFormatOggVorbis ()
 	add_sample_rate (SR_88_2);
 	add_sample_rate (SR_96);
 	add_sample_rate (SR_192);
+	add_sample_rate (SR_Session);
 
 	add_endianness (E_FileDefault);
 
@@ -301,6 +304,7 @@ ExportFormatFLAC::ExportFormatFLAC () :
 	add_sample_rate (SR_88_2);
 	add_sample_rate (SR_96);
 	add_sample_rate (SR_192);
+	add_sample_rate (SR_Session);
 
 	add_sample_format (SF_8);
 	add_sample_format (SF_16);
@@ -334,6 +338,7 @@ ExportFormatBWF::ExportFormatBWF () :
 	add_sample_rate (SR_88_2);
 	add_sample_rate (SR_96);
 	add_sample_rate (SR_192);
+	add_sample_rate (SR_Session);
 
 	add_sample_format (SF_U8);
 	add_sample_format (SF_16);