X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_formats.cc;h=463a09468a6493c5e14a3534729a1b8d7d711638;hb=5b4c3aa226dc95f33dc3ffae6669a24f5e8b8fe0;hp=362076876e10b75c030b115c48f1d4e514d88534;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/libs/ardour/export_formats.cc b/libs/ardour/export_formats.cc
index 362076876e..463a09468a 100644
--- a/libs/ardour/export_formats.cc
+++ b/libs/ardour/export_formats.cc
@@ -59,19 +59,25 @@ HasSampleFormat::add_sample_format (ExportFormatBase::SampleFormat format)
 
 	SampleFormatPtr ptr (new SampleFormatState (format, get_sample_format_name (format)));
 	sample_format_states.push_back (ptr);
-	ptr->SelectChanged.connect (sigc::bind (SampleFormatSelectChanged.make_slot(), WeakSampleFormatPtr (ptr)));
-	ptr->SelectChanged.connect (sigc::mem_fun (*this, &HasSampleFormat::update_sample_format_selection));
-	ptr->CompatibleChanged.connect (sigc::bind (SampleFormatCompatibleChanged.make_slot(), WeakSampleFormatPtr (ptr)));
+	ptr->SelectChanged.connect_same_thread (*this, boost::bind (&HasSampleFormat::update_sample_format_selection, this, _1));
+	// BOOST SIGNALS Could this be made any uglier?
+	ptr->SelectChanged.connect_same_thread (*this,
+		boost::bind (boost::type<void> (), boost::ref (SampleFormatSelectChanged), _1, WeakSampleFormatPtr (ptr)));
+	ptr->CompatibleChanged.connect_same_thread (*this,
+		boost::bind (boost::type<void> (), boost::ref (SampleFormatCompatibleChanged), _1, WeakSampleFormatPtr (ptr)));
 }
 
 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);
-	ptr->SelectChanged.connect (sigc::bind (DitherTypeSelectChanged.make_slot(), WeakDitherTypePtr (ptr)));
-	ptr->SelectChanged.connect (sigc::mem_fun (*this, &HasSampleFormat::update_dither_type_selection));
-	ptr->CompatibleChanged.connect (sigc::bind (DitherTypeCompatibleChanged.make_slot(), WeakDitherTypePtr (ptr)));
+	ptr->SelectChanged.connect_same_thread (*this, boost::bind (&HasSampleFormat::update_dither_type_selection, this, _1));
+	// BOOST SIGNALS Could this be made any uglier?
+	ptr->SelectChanged.connect_same_thread (*this,
+		boost::bind (boost::type<void> (), boost::ref (DitherTypeSelectChanged), _1, WeakDitherTypePtr (ptr)));
+	ptr->CompatibleChanged.connect_same_thread (*this,
+		boost::bind (boost::type<void> (),boost::ref ( DitherTypeCompatibleChanged), _1, WeakDitherTypePtr (ptr)));
 }
 
 HasSampleFormat::SampleFormatPtr
@@ -173,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);
 
@@ -256,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);
 
@@ -295,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);
@@ -328,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);