take read-lock when saving processor order

[ardour.git] / libs / ardour / export_format_manager.cc

diff --git a/libs/ardour/export_format_manager.cc b/libs/ardour/export_format_manager.cc
index f995bc1b0e87991ccc87d4d517dba9f567b079a9..65544122739c7f0e08dfafd6d2efc50fd8b5b62a 100644 (file)
--- a/libs/ardour/export_format_manager.cc
+++ b/libs/ardour/export_format_manager.cc
@@ -20,7 +20,6 @@
 
 #include "ardour/export_format_manager.h"
 
-#include "ardour/types.h"
 #include "ardour/export_format_specification.h"
 #include "ardour/export_format_compatibility.h"
 
@@ -41,6 +40,8 @@ ExportFormatManager::ExportFormatManager (ExportFormatSpecPtr specification) :
        init_qualities ();
        init_formats ();
        init_sample_rates ();
+
+       prev_description = current_selection->description();
 }
 
 ExportFormatManager::~ExportFormatManager ()
@@ -177,6 +178,17 @@ ExportFormatManager::init_formats ()
        fl_ptr->set_extension ("w64");
        add_format (f_ptr);
 
+       f_ptr.reset (fl_ptr = new ExportFormatLinear ("CAF", ExportFormatBase::F_CAF));
+       fl_ptr->add_sample_format (ExportFormatBase::SF_U8);
+       fl_ptr->add_sample_format (ExportFormatBase::SF_16);
+       fl_ptr->add_sample_format (ExportFormatBase::SF_24);
+       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->set_default_sample_format (ExportFormatBase::SF_Float);
+       fl_ptr->set_extension ("caf");
+       add_format (f_ptr);
+
        f_ptr.reset (fl_ptr = new ExportFormatLinear ("RAW", ExportFormatBase::F_RAW));
        fl_ptr->add_sample_format (ExportFormatBase::SF_U8);
        fl_ptr->add_sample_format (ExportFormatBase::SF_8);
@@ -204,6 +216,7 @@ void
 ExportFormatManager::init_sample_rates ()
 {
        add_sample_rate (SampleRatePtr (new SampleRateState (ExportFormatBase::SR_Session, _("Session rate"))));
+       add_sample_rate (SampleRatePtr (new SampleRateState (ExportFormatBase::SR_8, "8 kHz")));
        add_sample_rate (SampleRatePtr (new SampleRateState (ExportFormatBase::SR_22_05, "22,05 kHz")));
        add_sample_rate (SampleRatePtr (new SampleRateState (ExportFormatBase::SR_44_1, "44,1 kHz")));
        add_sample_rate (SampleRatePtr (new SampleRateState (ExportFormatBase::SR_48, "48 kHz")));
@@ -239,7 +252,7 @@ ExportFormatManager::add_format (ExportFormatPtr ptr)
 
        boost::shared_ptr<HasSampleFormat> hsf;
 
-       if (hsf = boost::dynamic_pointer_cast<HasSampleFormat> (ptr)) {
+       if ((hsf = boost::dynamic_pointer_cast<HasSampleFormat> (ptr))) {
                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));
        }
@@ -256,66 +269,112 @@ void
 ExportFormatManager::set_name (string name)
 {
        current_selection->set_name (name);
+       check_for_description_change ();
 }
 
 void
 ExportFormatManager::select_src_quality (ExportFormatBase::SRCQuality value)
 {
        current_selection->set_src_quality (value);
+       check_for_description_change ();
 }
 
 void
 ExportFormatManager::select_with_cue (bool value)
 {
        current_selection->set_with_cue (value);
+       check_for_description_change ();
 }
 
 void
 ExportFormatManager::select_with_toc (bool value)
 {
        current_selection->set_with_toc (value);
+       check_for_description_change ();
+}
+
+void
+ExportFormatManager::select_with_mp4chaps (bool value)
+{
+       current_selection->set_with_mp4chaps (value);
+       check_for_description_change ();
+}
+
+void
+ExportFormatManager::set_command (std::string command)
+{
+       current_selection->set_command (command);
+       check_for_description_change ();
 }
 
 void
 ExportFormatManager::select_trim_beginning (bool value)
 {
        current_selection->set_trim_beginning (value);
+       check_for_description_change ();
 }
 
 void
 ExportFormatManager::select_silence_beginning (AnyTime const & time)
 {
        current_selection->set_silence_beginning (time);
+       check_for_description_change ();
 }
 
 void
 ExportFormatManager::select_trim_end (bool value)
 {
        current_selection->set_trim_end (value);
+       check_for_description_change ();
 }
 
 void
 ExportFormatManager::select_silence_end (AnyTime const & time)
 {
        current_selection->set_silence_end (time);
+       check_for_description_change ();
 }
 
 void
 ExportFormatManager::select_normalize (bool value)
 {
        current_selection->set_normalize (value);
+       check_for_description_change ();
 }
 
 void
-ExportFormatManager::select_normalize_target (float value)
+ExportFormatManager::select_normalize_loudness (bool value)
 {
-       current_selection->set_normalize_target (value);
+       current_selection->set_normalize_loudness (value);
+       check_for_description_change ();
+}
+
+void
+ExportFormatManager::select_normalize_dbfs (float value)
+{
+       current_selection->set_normalize_dbfs (value);
+       check_for_description_change ();
+}
+
+void
+ExportFormatManager::select_normalize_lufs (float value)
+{
+       current_selection->set_normalize_lufs (value);
+       check_for_description_change ();
+}
+
+void
+ExportFormatManager::select_normalize_dbtp (float value)
+{
+       current_selection->set_normalize_dbtp (value);
+       check_for_description_change ();
 }
 
 void
 ExportFormatManager::select_tagging (bool tag)
 {
        current_selection->set_tag (tag);
+       check_for_description_change ();
 }
 
 void
@@ -682,7 +741,7 @@ ExportFormatManager::selection_changed ()
        }
 
        boost::shared_ptr<HasSampleFormat> hsf;
-       if (hsf = boost::dynamic_pointer_cast<HasSampleFormat> (get_selected_format())) {
+       if ((hsf = boost::dynamic_pointer_cast<HasSampleFormat> (get_selected_format()))) {
 
                SampleFormatList sf_list = hsf->get_sample_formats();
                for (SampleFormatList::iterator it = sf_list.begin(); it != sf_list.end(); ++it) {
@@ -695,15 +754,26 @@ ExportFormatManager::selection_changed ()
 
        }
 
-       /* Signal completeness */
+       /* Signal completeness and possible description change */
 
        CompleteChanged (current_selection->is_complete());
+       check_for_description_change ();
 
        /* Reset pending state */
 
        pending_selection_change = false;
 }
 
+void
+ExportFormatManager::check_for_description_change ()
+{
+       std::string new_description = current_selection->description();
+       if (new_description == prev_description) { return; }
+
+       prev_description = new_description;
+       DescriptionChanged();
+}
+
 ExportFormatManager::QualityPtr
 ExportFormatManager::get_selected_quality ()
 {
@@ -747,7 +817,7 @@ ExportFormatManager::get_selected_sample_format ()
 {
        boost::shared_ptr<HasSampleFormat> hsf;
 
-       if (hsf = boost::dynamic_pointer_cast<HasSampleFormat> (get_selected_format())) {
+       if ((hsf = boost::dynamic_pointer_cast<HasSampleFormat> (get_selected_format()))) {
                return hsf->get_selected_sample_format ();
        } else {
                return SampleFormatPtr ();