Remove unnecessary _have_transaction flag in TrimDrag. Fix undo when a trim of one...

[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 f950e6ab18b9e36a91e7dcf4b15b04f3f149f62c..ceea2b108220135cca0665a0df5fafe8714d8bb2 100644 (file)
--- a/gtk2_ardour/export_format_dialog.cc
+++ b/gtk2_ardour/export_format_dialog.cc
@@ -57,7 +57,7 @@ ExportFormatDialog::ExportFormatDialog (FormatPtr format, bool new_dialog) :
   sample_rate_label (_("Sample rate"), Gtk::ALIGN_LEFT),
   src_quality_label (_("Sample rate conversion quality:"), Gtk::ALIGN_RIGHT),
 
-  encoding_options_label (_(""), Gtk::ALIGN_LEFT),
+  encoding_options_label ("", Gtk::ALIGN_LEFT),
 
   /* Changing encoding options from here on */
 
@@ -228,11 +228,11 @@ ExportFormatDialog::load_state (FormatPtr spec)
 
        trim_start_checkbox.set_active (spec->trim_beginning());
        silence_start = spec->silence_beginning_time();
-       silence_start_checkbox.set_active (spec->silence_beginning() > 0);
+       silence_start_checkbox.set_active (spec->silence_beginning_time().not_zero());
 
        trim_end_checkbox.set_active (spec->trim_end());
        silence_end = spec->silence_end_time();
-       silence_end_checkbox.set_active (spec->silence_end() > 0);
+       silence_end_checkbox.set_active (spec->silence_end_time().not_zero());
 
        for (Gtk::ListStore::Children::iterator it = src_quality_list->children().begin(); it != src_quality_list->children().end(); ++it) {
                if (it->get_value (src_quality_cols.id) == spec->src_quality()) {