X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_format_manager.cc;h=7971622c4a941e306cfd73589a20a3b71f09ab67;hb=4d112a8e6b90fa64a5cd333042044768111ba994;hp=908ae6f8a8bf07c53499d00437d187f92a2854d9;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/libs/ardour/export_format_manager.cc b/libs/ardour/export_format_manager.cc
index 908ae6f8a8..7971622c4a 100644
--- a/libs/ardour/export_format_manager.cc
+++ b/libs/ardour/export_format_manager.cc
@@ -26,6 +26,8 @@
 
 #include "i18n.h"
 
+using std::string;
+
 namespace ARDOUR
 {
 
@@ -124,6 +126,7 @@ ExportFormatManager::init_formats ()
 	fl_ptr->add_sample_format (ExportFormatBase::SF_32);
 	fl_ptr->add_sample_format (ExportFormatBase::SF_Float);
 	fl_ptr->add_sample_format (ExportFormatBase::SF_Double);
+	fl_ptr->add_endianness (ExportFormatBase::E_Big); 
 	fl_ptr->set_default_sample_format (ExportFormatBase::SF_16);
 	fl_ptr->set_extension ("aiff");
 	add_format (f_ptr);
@@ -158,6 +161,7 @@ ExportFormatManager::init_formats ()
 	fl_ptr->add_sample_format (ExportFormatBase::SF_32);
 	fl_ptr->add_sample_format (ExportFormatBase::SF_Float);
 	fl_ptr->add_sample_format (ExportFormatBase::SF_Double);
+	fl_ptr->add_endianness (ExportFormatBase::E_Little); 
 	fl_ptr->set_default_sample_format (ExportFormatBase::SF_16);
 	fl_ptr->set_extension ("wav");
 	add_format (f_ptr);
@@ -211,13 +215,13 @@ void
 ExportFormatManager::add_compatibility (CompatPtr ptr)
 {
 	compatibilities.push_back (ptr);
-	ptr->SelectChanged.connect (sigc::bind (sigc::mem_fun (*this, &ExportFormatManager::change_compatibility_selection), WeakCompatPtr (ptr)));
+	ptr->SelectChanged.connect_same_thread (*this, boost::bind (&ExportFormatManager::change_compatibility_selection, this, _1, WeakCompatPtr (ptr)));
 }
 
 void
 ExportFormatManager::add_quality (QualityPtr ptr)
 {
-	ptr->SelectChanged.connect (sigc::bind (sigc::mem_fun (*this, &ExportFormatManager::change_quality_selection), WeakQualityPtr (ptr)));
+	ptr->SelectChanged.connect_same_thread (*this, boost::bind (&ExportFormatManager::change_quality_selection, this, _1, WeakQualityPtr (ptr)));
 	qualities.push_back (ptr);
 }
 
@@ -225,7 +229,7 @@ void
 ExportFormatManager::add_format (FormatPtr ptr)
 {
 	formats.push_back (ptr);
-	ptr->SelectChanged.connect (sigc::bind (sigc::mem_fun (*this, &ExportFormatManager::change_format_selection), WeakFormatPtr (ptr)));
+	ptr->SelectChanged.connect_same_thread (*this, boost::bind (&ExportFormatManager::change_format_selection, this, _1, WeakFormatPtr (ptr)));
 	universal_set = universal_set->get_union (*ptr);
 
 	/* Encoding options */
@@ -233,20 +237,20 @@ ExportFormatManager::add_format (FormatPtr ptr)
 	boost::shared_ptr<HasSampleFormat> hsf;
 
 	if (hsf = boost::dynamic_pointer_cast<HasSampleFormat> (ptr)) {
-		hsf->SampleFormatSelectChanged.connect (sigc::mem_fun (*this, &ExportFormatManager::change_sample_format_selection));
-		hsf->DitherTypeSelectChanged.connect (sigc::mem_fun (*this, &ExportFormatManager::change_dither_type_selection));
+		hsf->SampleFormatSelectChanged.connect_same_thread (*this, boost::bind (&ExportFormatManager::change_sample_format_selection, this, _1, _2));
+		hsf->DitherTypeSelectChanged.connect_same_thread (*this, boost::bind (&ExportFormatManager::change_dither_type_selection, this, _1, _2));
 	}
 }
 
 void
 ExportFormatManager::add_sample_rate (SampleRatePtr ptr)
 {
-	ptr->SelectChanged.connect (sigc::bind (sigc::mem_fun (*this, &ExportFormatManager::change_sample_rate_selection), WeakSampleRatePtr (ptr)));
+	ptr->SelectChanged.connect_same_thread (*this, boost::bind (&ExportFormatManager::change_sample_rate_selection, this, _1, WeakSampleRatePtr (ptr)));
 	sample_rates.push_back (ptr);
 }
 
 void
-ExportFormatManager::set_name (Glib::ustring name)
+ExportFormatManager::set_name (string name)
 {
 	current_selection->set_name (name);
 }