Yet another bug in previous commit.

[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 d719fcecb39c73fe96765c06a7b67d943ba40306..1a8ecf8ffab44dcee21893a0956ece5cbf148041 100644 (file)
--- a/gtk2_ardour/export_format_dialog.cc
+++ b/gtk2_ardour/export_format_dialog.cc
@@ -44,11 +44,11 @@ ExportFormatDialog::ExportFormatDialog (FormatPtr format, bool new_dialog) :
   silence_table (2, 4),
   trim_start_checkbox (_("Trim silence at start")),
   silence_start_checkbox (_("Add silence at start:")),
-  silence_start_clock ("silence_start", true, "PreRollClock", true, false, true),
+  silence_start_clock ("silence_start", true, "", true, false, true),
 
   trim_end_checkbox (_("Trim silence at end")),
   silence_end_checkbox (_("Add silence at end:")),
-  silence_end_clock ("silence_end", true, "PreRollClock", true, false, true),
+  silence_end_clock ("silence_end", true, "", true, false, true),
 
   format_table (3, 4),
   compatibility_label (_("Compatibility"), Gtk::ALIGN_LEFT),
@@ -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);
@@ -798,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 ();