Move panner bypass state up to the PannerShell so that it is preserved even when...

[ardour.git] / gtk2_ardour / export_format_dialog.cc

diff --git a/gtk2_ardour/export_format_dialog.cc b/gtk2_ardour/export_format_dialog.cc
index 098693466160c6ff4d82862213f25510f7a2dbc5..c8e139acceeca59fc01e567f05d1f813b4fa4824 100644 (file)
--- a/gtk2_ardour/export_format_dialog.cc
+++ b/gtk2_ardour/export_format_dialog.cc
@@ -493,7 +493,7 @@ ExportFormatDialog::update_compatibility_selection (std::string const & path)
 {
 
        Gtk::TreeModel::iterator iter = compatibility_view.get_model ()->get_iter (path);
-       ExportFormatManager::CompatPtr ptr = iter->get_value (compatibility_cols.ptr);
+       ExportFormatCompatibilityPtr ptr = iter->get_value (compatibility_cols.ptr);
        bool state = iter->get_value (compatibility_cols.selected);
 
        iter->set_value (compatibility_cols.selected, state);
@@ -553,7 +553,7 @@ ExportFormatDialog::change_compatibility_selection (bool select, WeakCompatPtr c
 {
        ++applying_changes_from_engine;
 
-       ExportFormatManager::CompatPtr ptr = compat.lock();
+       ExportFormatCompatibilityPtr ptr = compat.lock();
 
        for (Gtk::ListStore::Children::iterator it = compatibility_list->children().begin(); it != compatibility_list->children().end(); ++it) {
                if (it->get_value (compatibility_cols.ptr) == ptr) {
@@ -576,7 +576,7 @@ ExportFormatDialog::change_format_selection (bool select, WeakFormatPtr format)
 {
        change_selection<ExportFormat, FormatCols> (select, format, format_list, format_view, format_cols);
 
-       ExportFormatManager::FormatPtr ptr = format.lock();
+       ExportFormatPtr ptr = format.lock();
 
        if (select && ptr) {
                change_encoding_options (ptr);
@@ -780,9 +780,6 @@ ExportFormatDialog::update_time (AnyTime & time, AudioClock const & clock)
                time.type = AnyTime::Frames;
                time.frames = frames;
                break;
-         case AudioClock::Off:
-               silence_end_checkbox.set_active (false);
-               return;
        }
 }
 
@@ -801,7 +798,7 @@ ExportFormatDialog::update_tagging_selection ()
 }
 
 void
-ExportFormatDialog::change_encoding_options (ExportFormatManager::FormatPtr ptr)
+ExportFormatDialog::change_encoding_options (ExportFormatPtr ptr)
 {
        empty_encoding_option_table ();