X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fexport_format_dialog.cc;h=ceea2b108220135cca0665a0df5fafe8714d8bb2;hb=5f4bdb233a53932986e07fca1cd6c87d22c2886f;hp=2e9f20d120808ea37eb3e5c21c2d293f51aaa682;hpb=fa5aeb7892fb73d45782b42da731bc5a51418e79;p=ardour.git diff --git a/gtk2_ardour/export_format_dialog.cc b/gtk2_ardour/export_format_dialog.cc index 2e9f20d120..ceea2b1082 100644 --- a/gtk2_ardour/export_format_dialog.cc +++ b/gtk2_ardour/export_format_dialog.cc @@ -18,17 +18,17 @@ */ -#include "export_format_dialog.h" - #include "ardour/session.h" #include "ardour/export_format_specification.h" +#include "export_format_dialog.h" +#include "gui_thread.h" #include "i18n.h" using namespace ARDOUR; ExportFormatDialog::ExportFormatDialog (FormatPtr format, bool new_dialog) : - ArdourDialog (new_dialog ? _("New export format profile") : _("Edit export format profile")), + ArdourDialog (new_dialog ? _("New Export Format Profile") : _("Edit Export Format Profile")), format (format), manager (format), original_state (format->get_state()), @@ -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, true), + silence_start_clock ("silence_start", true, "PreRollClock", 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, true), + silence_end_clock ("silence_end", true, "PreRollClock", true, false, true), format_table (3, 4), compatibility_label (_("Compatibility"), Gtk::ALIGN_LEFT), @@ -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 */ @@ -123,11 +123,11 @@ ExportFormatDialog::ExportFormatDialog (FormatPtr format, bool new_dialog) : /* Buttons */ revert_button = add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); - revert_button->signal_clicked().connect (mem_fun(*this, &ExportFormatDialog::revert)); + revert_button->signal_clicked().connect (sigc::mem_fun(*this, &ExportFormatDialog::revert)); close_button = add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_APPLY); close_button->set_sensitive (false); - close_button->signal_clicked().connect (mem_fun (*this, &ExportFormatDialog::end_dialog)); - manager.CompleteChanged.connect (mem_fun (*close_button, &Gtk::Button::set_sensitive)); + close_button->signal_clicked().connect (sigc::mem_fun (*this, &ExportFormatDialog::end_dialog)); + manager.CompleteChanged.connect (*this, invalidator (*this), ui_bind (&Gtk::Button::set_sensitive, close_button, _1), gui_context()); /* Load state before hooking up the rest of the signals */ @@ -135,40 +135,40 @@ ExportFormatDialog::ExportFormatDialog (FormatPtr format, bool new_dialog) : /* Name entry */ - name_entry.signal_changed().connect (mem_fun (*this, &ExportFormatDialog::update_name)); + name_entry.signal_changed().connect (sigc::mem_fun (*this, &ExportFormatDialog::update_name)); /* Normalize, silence and src_quality signals */ - trim_start_checkbox.signal_toggled().connect (mem_fun (*this, &ExportFormatDialog::update_trim_start_selection)); - trim_end_checkbox.signal_toggled().connect (mem_fun (*this, &ExportFormatDialog::update_trim_end_selection)); + trim_start_checkbox.signal_toggled().connect (sigc::mem_fun (*this, &ExportFormatDialog::update_trim_start_selection)); + trim_end_checkbox.signal_toggled().connect (sigc::mem_fun (*this, &ExportFormatDialog::update_trim_end_selection)); - normalize_checkbox.signal_toggled().connect (mem_fun (*this, &ExportFormatDialog::update_normalize_selection)); - normalize_spinbutton.signal_value_changed().connect (mem_fun (*this, &ExportFormatDialog::update_normalize_selection)); + normalize_checkbox.signal_toggled().connect (sigc::mem_fun (*this, &ExportFormatDialog::update_normalize_selection)); + normalize_spinbutton.signal_value_changed().connect (sigc::mem_fun (*this, &ExportFormatDialog::update_normalize_selection)); - silence_start_checkbox.signal_toggled().connect (mem_fun (*this, &ExportFormatDialog::update_silence_start_selection)); - silence_start_clock.ValueChanged.connect (mem_fun (*this, &ExportFormatDialog::update_silence_start_selection)); + silence_start_checkbox.signal_toggled().connect (sigc::mem_fun (*this, &ExportFormatDialog::update_silence_start_selection)); + silence_start_clock.ValueChanged.connect (sigc::mem_fun (*this, &ExportFormatDialog::update_silence_start_selection)); - silence_end_checkbox.signal_toggled().connect (mem_fun (*this, &ExportFormatDialog::update_silence_end_selection)); - silence_end_clock.ValueChanged.connect (mem_fun (*this, &ExportFormatDialog::update_silence_end_selection)); + silence_end_checkbox.signal_toggled().connect (sigc::mem_fun (*this, &ExportFormatDialog::update_silence_end_selection)); + silence_end_clock.ValueChanged.connect (sigc::mem_fun (*this, &ExportFormatDialog::update_silence_end_selection)); - src_quality_combo.signal_changed().connect (mem_fun (*this, &ExportFormatDialog::update_src_quality_selection)); + src_quality_combo.signal_changed().connect (sigc::mem_fun (*this, &ExportFormatDialog::update_src_quality_selection)); /* Format table signals */ Gtk::CellRendererToggle *toggle = dynamic_cast(compatibility_view.get_column_cell_renderer (0)); - toggle->signal_toggled().connect (mem_fun (*this, &ExportFormatDialog::update_compatibility_selection)); - compatibility_select_connection = compatibility_view.get_selection()->signal_changed().connect (mem_fun (*this, &ExportFormatDialog::prohibit_compatibility_selection)); + toggle->signal_toggled().connect (sigc::mem_fun (*this, &ExportFormatDialog::update_compatibility_selection)); + compatibility_select_connection = compatibility_view.get_selection()->signal_changed().connect (sigc::mem_fun (*this, &ExportFormatDialog::prohibit_compatibility_selection)); - quality_view.get_selection()->signal_changed().connect (mem_fun(*this, &ExportFormatDialog::update_quality_selection)); - format_view.get_selection()->signal_changed().connect (mem_fun(*this, &ExportFormatDialog::update_format_selection)); - sample_rate_view.get_selection()->signal_changed().connect (mem_fun(*this, &ExportFormatDialog::update_sample_rate_selection)); + quality_view.get_selection()->signal_changed().connect (sigc::mem_fun(*this, &ExportFormatDialog::update_quality_selection)); + format_view.get_selection()->signal_changed().connect (sigc::mem_fun(*this, &ExportFormatDialog::update_format_selection)); + sample_rate_view.get_selection()->signal_changed().connect (sigc::mem_fun(*this, &ExportFormatDialog::update_sample_rate_selection)); /* Encoding option signals */ - sample_format_view.get_selection()->signal_changed().connect (mem_fun(*this, &ExportFormatDialog::update_sample_format_selection)); - dither_type_view.get_selection()->signal_changed().connect (mem_fun(*this, &ExportFormatDialog::update_dither_type_selection)); + sample_format_view.get_selection()->signal_changed().connect (sigc::mem_fun(*this, &ExportFormatDialog::update_sample_format_selection)); + dither_type_view.get_selection()->signal_changed().connect (sigc::mem_fun(*this, &ExportFormatDialog::update_dither_type_selection)); - tag_checkbox.signal_toggled().connect (mem_fun (*this, &ExportFormatDialog::update_tagging_selection)); + tag_checkbox.signal_toggled().connect (sigc::mem_fun (*this, &ExportFormatDialog::update_tagging_selection)); /* Finalize */ @@ -194,14 +194,14 @@ ExportFormatDialog::revert () void ExportFormatDialog::set_session (ARDOUR::Session* s) { - session = s; - if (!session) { - return; - } - + SessionHandlePtr::set_session (s); silence_start_clock.set_session (s); silence_end_clock.set_session (s); + if (!_session) { + return; + } + update_clock (silence_start_clock, silence_start); update_clock (silence_end_clock, silence_end); @@ -210,7 +210,7 @@ ExportFormatDialog::set_session (ARDOUR::Session* s) if (sample_rate_view.get_selection()->count_selected_rows() == 0) { Gtk::ListStore::Children::iterator it; for (it = sample_rate_list->children().begin(); it != sample_rate_list->children().end(); ++it) { - if ((nframes_t) (*it)->get_value (sample_rate_cols.ptr)->rate == session->nominal_frame_rate()) { + if ((framecnt_t) (*it)->get_value (sample_rate_cols.ptr)->rate == _session->nominal_frame_rate()) { sample_rate_view.get_selection()->select (it); break; } @@ -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()) { @@ -242,8 +242,12 @@ ExportFormatDialog::load_state (FormatPtr spec) } for (Gtk::ListStore::Children::iterator it = format_list->children().begin(); it != format_list->children().end(); ++it) { - if (it->get_value (format_cols.ptr)->get_format_id() == spec->format_id()) { - it->get_value (format_cols.ptr)->set_selected (true); + boost::shared_ptr format_in_list = it->get_value (format_cols.ptr); + if (format_in_list->get_format_id() == spec->format_id() && + // BWF has the same format id with wav, so we need to check this. + format_in_list->has_broadcast_info() == spec->has_broadcast_info()) { + + format_in_list->set_selected (true); break; } } @@ -319,7 +323,7 @@ ExportFormatDialog::init_format_table () row[compatibility_cols.label] = (*it)->name(); WeakCompatPtr ptr (*it); - (*it)->SelectChanged.connect (sigc::bind (sigc::mem_fun (*this, &ExportFormatDialog::change_compatibility_selection), ptr)); + (*it)->SelectChanged.connect (*this, invalidator (*this), ui_bind (&ExportFormatDialog::change_compatibility_selection, this, _1, ptr), gui_context()); } compatibility_view.append_column_editable ("", compatibility_cols.selected); @@ -347,8 +351,8 @@ ExportFormatDialog::init_format_table () row[quality_cols.label] = (*it)->name(); WeakQualityPtr ptr (*it); - (*it)->SelectChanged.connect (sigc::bind (sigc::mem_fun (*this, &ExportFormatDialog::change_quality_selection), ptr)); - (*it)->CompatibleChanged.connect (sigc::bind (sigc::mem_fun (*this, &ExportFormatDialog::change_quality_compatibility), ptr)); + (*it)->SelectChanged.connect (*this, invalidator (*this), ui_bind (&ExportFormatDialog::change_quality_selection, this, _1, ptr), gui_context()); + (*it)->CompatibleChanged.connect (*this, invalidator (*this), ui_bind (&ExportFormatDialog::change_quality_compatibility, this, _1, ptr), gui_context()); } quality_view.append_column ("", quality_cols.label); @@ -369,19 +373,19 @@ ExportFormatDialog::init_format_table () row[format_cols.label] = (*it)->name(); WeakFormatPtr ptr (*it); - (*it)->SelectChanged.connect (sigc::bind (sigc::mem_fun (*this, &ExportFormatDialog::change_format_selection), ptr)); - (*it)->CompatibleChanged.connect (sigc::bind (sigc::mem_fun (*this, &ExportFormatDialog::change_format_compatibility), ptr)); + (*it)->SelectChanged.connect (*this, invalidator (*this), ui_bind (&ExportFormatDialog::change_format_selection, this, _1, ptr), gui_context()); + (*it)->CompatibleChanged.connect (*this, invalidator (*this), ui_bind (&ExportFormatDialog::change_format_compatibility, this, _1, ptr), gui_context()); /* Encoding options */ boost::shared_ptr hsf; if (hsf = boost::dynamic_pointer_cast (*it)) { - hsf->SampleFormatSelectChanged.connect (sigc::mem_fun (*this, &ExportFormatDialog::change_sample_format_selection)); - hsf->SampleFormatCompatibleChanged.connect (sigc::mem_fun (*this, &ExportFormatDialog::change_sample_format_compatibility)); + hsf->SampleFormatSelectChanged.connect (*this, invalidator (*this), ui_bind (&ExportFormatDialog::change_sample_format_selection, this, _1, _2), gui_context()); + hsf->SampleFormatCompatibleChanged.connect (*this, invalidator (*this), ui_bind (&ExportFormatDialog::change_sample_format_compatibility, this, _1, _2), gui_context()); - hsf->DitherTypeSelectChanged.connect (sigc::mem_fun (*this, &ExportFormatDialog::change_dither_type_selection)); - hsf->DitherTypeCompatibleChanged.connect (sigc::mem_fun (*this, &ExportFormatDialog::change_dither_type_compatibility)); + hsf->DitherTypeSelectChanged.connect (*this, invalidator (*this), ui_bind (&ExportFormatDialog::change_dither_type_selection, this, _1, _2), gui_context()); + hsf->DitherTypeCompatibleChanged.connect (*this, invalidator (*this), ui_bind (&ExportFormatDialog::change_dither_type_compatibility, this, _1, _2), gui_context()); } } @@ -401,10 +405,10 @@ ExportFormatDialog::init_format_table () row[sample_rate_cols.ptr] = *it; row[sample_rate_cols.color] = "white"; row[sample_rate_cols.label] = (*it)->name(); - + WeakSampleRatePtr ptr (*it); - (*it)->SelectChanged.connect (sigc::bind (sigc::mem_fun (*this, &ExportFormatDialog::change_sample_rate_selection), ptr)); - (*it)->CompatibleChanged.connect (sigc::bind (sigc::mem_fun (*this, &ExportFormatDialog::change_sample_rate_compatibility), ptr)); + (*it)->SelectChanged.connect (*this, invalidator (*this), ui_bind (&ExportFormatDialog::change_sample_rate_selection, this, _1, ptr), gui_context()); + (*it)->CompatibleChanged.connect (*this, invalidator (*this), ui_bind (&ExportFormatDialog::change_sample_rate_compatibility, this, _1, ptr), gui_context()); } sample_rate_view.append_column ("", sample_rate_cols.label); @@ -485,7 +489,7 @@ ExportFormatDialog::init_encoding_option_widgets () } void -ExportFormatDialog::update_compatibility_selection (Glib::ustring const & path) +ExportFormatDialog::update_compatibility_selection (std::string const & path) { Gtk::TreeModel::iterator iter = compatibility_view.get_model ()->get_iter (path); @@ -586,8 +590,8 @@ ExportFormatDialog::change_sample_rate_selection (bool select, WeakSampleRatePtr if (select) { ExportFormatManager::SampleRatePtr ptr = rate.lock(); - if (ptr && session) { - src_quality_combo.set_sensitive ((uint32_t) ptr->rate != session->frame_rate()); + if (ptr && _session) { + src_quality_combo.set_sensitive ((uint32_t) ptr->rate != _session->frame_rate()); } } } @@ -668,7 +672,7 @@ ExportFormatDialog::change_dither_type_compatibility (bool compatibility, WeakDi template void ExportFormatDialog::change_compatibility (bool compatibility, boost::weak_ptr w_ptr, Glib::RefPtr & list, ColsT & cols, - Glib::ustring const & c_incompatible, Glib::ustring const & c_compatible) + std::string const & c_incompatible, std::string const & c_compatible) { boost::shared_ptr ptr = w_ptr.lock(); @@ -728,7 +732,7 @@ void ExportFormatDialog::update_clock (AudioClock & clock, ARDOUR::AnyTime const & time) { // TODO position - clock.set (session->convert_to_frames_at (0, time), true); + clock.set (_session->convert_to_frames_at (0, time), true); AudioClock::Mode mode(AudioClock::Timecode); @@ -753,24 +757,24 @@ ExportFormatDialog::update_clock (AudioClock & clock, ARDOUR::AnyTime const & ti void ExportFormatDialog::update_time (AnyTime & time, AudioClock const & clock) { - if (!session) { + if (!_session) { return; } - nframes_t frames = clock.current_duration(); + framecnt_t frames = clock.current_duration(); switch (clock.mode()) { case AudioClock::Timecode: time.type = AnyTime::Timecode; - session->timecode_time (frames, time.timecode); + _session->timecode_time (frames, time.timecode); break; case AudioClock::BBT: time.type = AnyTime::BBT; - session->bbt_time (frames, time.bbt); + _session->bbt_time (frames, time.bbt); break; case AudioClock::MinSec: time.type = AnyTime::Seconds; - time.seconds = (double) frames / session->frame_rate(); + time.seconds = (double) frames / _session->frame_rate(); break; case AudioClock::Frames: time.type = AnyTime::Frames;