X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fexport_format_dialog.cc;h=ceea2b108220135cca0665a0df5fafe8714d8bb2;hb=84b4dd94e34afea47dcb6b411215d5b86f112e25;hp=22852882ba97213c2e6ddcfffcfd26d405b845d5;hpb=1928f286e91243004a014ec67c8bb13976d0927b;p=ardour.git diff --git a/gtk2_ardour/export_format_dialog.cc b/gtk2_ardour/export_format_dialog.cc index 22852882ba..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 */ @@ -68,110 +68,110 @@ ExportFormatDialog::ExportFormatDialog (FormatPtr format, bool new_dialog) : { /* Pack containers in dialog */ - + get_vbox()->pack_start (name_hbox, false, false, 0); get_vbox()->pack_start (silence_table, false, false, 6); get_vbox()->pack_start (format_table, false, false, 6); get_vbox()->pack_start (encoding_options_vbox, false, false, 0); - + /* Name, new and remove */ - + name_hbox.pack_start (name_label, false, false, 0); name_hbox.pack_start (name_entry, true, true, 0); - + /* Normalize */ - + normalize_hbox.pack_start (normalize_checkbox, false, false, 0); normalize_hbox.pack_start (normalize_spinbutton, false, false, 6); normalize_hbox.pack_start (normalize_db_label, false, false, 0); - + normalize_spinbutton.configure (normalize_adjustment, 0.1, 2); - + /* Silence */ - + silence_table.set_row_spacings (6); silence_table.set_col_spacings (12); - + silence_table.attach (normalize_hbox, 0, 3, 0, 1); - + silence_table.attach (trim_start_checkbox, 0, 1, 1, 2); silence_table.attach (silence_start_checkbox, 1, 2, 1, 2); silence_table.attach (silence_start_clock, 2, 3, 1, 2); - + silence_table.attach (trim_end_checkbox, 0, 1, 2, 3); silence_table.attach (silence_end_checkbox, 1, 2, 2, 3); silence_table.attach (silence_end_clock, 2, 3, 2, 3); - + /* Format table */ init_format_table(); - + /* Encoding options */ - + init_encoding_option_widgets(); - + encoding_options_table.set_spacings (1); - + encoding_options_vbox.pack_start (encoding_options_label, false, false, 0); encoding_options_vbox.pack_start (encoding_options_table, false, false, 12); - + Pango::AttrList bold; Pango::Attribute b = Pango::Attribute::create_attr_weight (Pango::WEIGHT_BOLD); bold.insert (b); encoding_options_label.set_attributes (bold); - + /* 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 */ - + load_state (format); - + /* 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)); - - 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)); - - 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_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)); - - src_quality_combo.signal_changed().connect (mem_fun (*this, &ExportFormatDialog::update_src_quality_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 (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 (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 (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 (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)); - - 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)); - + 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 (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)); - - tag_checkbox.signal_toggled().connect (mem_fun (*this, &ExportFormatDialog::update_tagging_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 (sigc::mem_fun (*this, &ExportFormatDialog::update_tagging_selection)); + /* Finalize */ - + show_all_children(); } @@ -184,33 +184,33 @@ void ExportFormatDialog::revert () { ++applying_changes_from_engine; - + format->set_state (original_state); load_state (format); - + --applying_changes_from_engine; } 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); - + /* Select native samplerate if no selection is yet made */ - + 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; } @@ -222,39 +222,43 @@ void ExportFormatDialog::load_state (FormatPtr spec) { name_entry.set_text (spec->name()); - + normalize_checkbox.set_active (spec->normalize()); normalize_spinbutton.set_value (spec->normalize_target()); - + 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()) { src_quality_combo.set_active (it); break; } } - + 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; } } - + for (Gtk::ListStore::Children::iterator it = sample_rate_list->children().begin(); it != sample_rate_list->children().end(); ++it) { if (it->get_value (sample_rate_cols.ptr)->rate == spec->sample_rate()) { it->get_value (sample_rate_cols.ptr)->set_selected (true); break; } } - + if (spec->sample_format()) { for (Gtk::ListStore::Children::iterator it = sample_format_list->children().begin(); it != sample_format_list->children().end(); ++it) { if (it->get_value (sample_format_cols.ptr)->format == spec->sample_format()) { @@ -262,7 +266,7 @@ ExportFormatDialog::load_state (FormatPtr spec) break; } } - + for (Gtk::ListStore::Children::iterator it = dither_type_list->children().begin(); it != dither_type_list->children().end(); ++it) { if (it->get_value (dither_type_cols.ptr)->type == spec->dither_type()) { it->get_value (dither_type_cols.ptr)->set_selected (true); @@ -270,7 +274,7 @@ ExportFormatDialog::load_state (FormatPtr spec) } } } - + tag_checkbox.set_active (spec->tag()); } @@ -279,20 +283,20 @@ ExportFormatDialog::init_format_table () { format_table.set_spacings (1); - + format_table.attach (compatibility_label, 0, 1, 0, 1); format_table.attach (quality_label, 1, 2, 0, 1); format_table.attach (format_label, 2, 3, 0, 1); format_table.attach (sample_rate_label, 3, 4, 0, 1); - + format_table.attach (compatibility_view, 0, 1, 1, 2); format_table.attach (quality_view, 1, 2, 1, 2); format_table.attach (format_view, 2, 3, 1, 2); format_table.attach (sample_rate_view, 3, 4, 1, 2); - + format_table.attach (src_quality_label, 0, 3, 2, 3); format_table.attach (src_quality_combo, 3, 4, 2, 3); - + compatibility_view.set_headers_visible (false); quality_view.set_headers_visible (false); format_view.set_headers_visible (false); @@ -307,108 +311,108 @@ ExportFormatDialog::init_format_table () compatibility_list = Gtk::ListStore::create (compatibility_cols); compatibility_view.set_model (compatibility_list); - + ExportFormatManager::CompatList const & compat_list = manager.get_compatibilities(); - + for (ExportFormatManager::CompatList::const_iterator it = compat_list.begin(); it != compat_list.end(); ++it) { iter = compatibility_list->append(); row = *iter; - + row[compatibility_cols.ptr] = *it; row[compatibility_cols.selected] = false; 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); - + Gtk::CellRendererText* text_renderer = Gtk::manage (new Gtk::CellRendererText); text_renderer->property_editable() = false; - + Gtk::TreeView::Column* column = compatibility_view.get_column (0); column->pack_start (*text_renderer); column->add_attribute (text_renderer->property_text(), compatibility_cols.label); - + /* Qualities */ quality_list = Gtk::ListStore::create (quality_cols); quality_view.set_model (quality_list); - + ExportFormatManager::QualityList const & qualities = manager.get_qualities (); - + for (ExportFormatManager::QualityList::const_iterator it = qualities.begin(); it != qualities.end(); ++it) { iter = quality_list->append(); row = *iter; - + row[quality_cols.ptr] = *it; row[quality_cols.color] = "white"; 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); - + /* Formats */ - + format_list = Gtk::ListStore::create (format_cols); format_view.set_model (format_list); - + ExportFormatManager::FormatList const & formats = manager.get_formats (); - + for (ExportFormatManager::FormatList::const_iterator it = formats.begin(); it != formats.end(); ++it) { iter = format_list->append(); row = *iter; - + row[format_cols.ptr] = *it; row[format_cols.color] = "white"; 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->DitherTypeSelectChanged.connect (sigc::mem_fun (*this, &ExportFormatDialog::change_dither_type_selection)); - hsf->DitherTypeCompatibleChanged.connect (sigc::mem_fun (*this, &ExportFormatDialog::change_dither_type_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 (*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()); } } - + format_view.append_column ("", format_cols.label); - + /* Sample Rates */ - + sample_rate_list = Gtk::ListStore::create (sample_rate_cols); sample_rate_view.set_model (sample_rate_list); - + ExportFormatManager::SampleRateList const & rates = manager.get_sample_rates (); - + for (ExportFormatManager::SampleRateList::const_iterator it = rates.begin(); it != rates.end(); ++it) { iter = sample_rate_list->append(); row = *iter; - + 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); - + /* Color rendering */ Gtk::TreeViewColumn * label_col; @@ -417,45 +421,45 @@ ExportFormatDialog::init_format_table () label_col = quality_view.get_column(0); renderer = dynamic_cast (quality_view.get_column_cell_renderer (0)); label_col->add_attribute(renderer->property_foreground(), quality_cols.color); - + label_col = format_view.get_column(0); renderer = dynamic_cast (format_view.get_column_cell_renderer (0)); label_col->add_attribute(renderer->property_foreground(), format_cols.color); - + label_col = sample_rate_view.get_column(0); renderer = dynamic_cast (sample_rate_view.get_column_cell_renderer (0)); label_col->add_attribute(renderer->property_foreground(), sample_rate_cols.color); - + /* SRC Qualities */ - + src_quality_list = Gtk::ListStore::create (src_quality_cols); src_quality_combo.set_model (src_quality_list); - + iter = src_quality_list->append(); row = *iter; row[src_quality_cols.id] = ExportFormatBase::SRC_SincBest; row[src_quality_cols.label] = _("Best (sinc)"); - + iter = src_quality_list->append(); row = *iter; row[src_quality_cols.id] = ExportFormatBase::SRC_SincMedium; row[src_quality_cols.label] = _("Medium (sinc)"); - + iter = src_quality_list->append(); row = *iter; row[src_quality_cols.id] = ExportFormatBase::SRC_SincFast; row[src_quality_cols.label] = _("Fast (sinc)"); - + iter = src_quality_list->append(); row = *iter; row[src_quality_cols.id] = ExportFormatBase::SRC_Linear; row[src_quality_cols.label] = _("Linear"); - + iter = src_quality_list->append(); row = *iter; row[src_quality_cols.id] = ExportFormatBase::SRC_ZeroOrderHold; row[src_quality_cols.label] = _("Zero order hold"); - + src_quality_combo.pack_start (src_quality_cols.label); src_quality_combo.set_active (0); } @@ -473,7 +477,7 @@ ExportFormatDialog::init_encoding_option_widgets () label_col = sample_format_view.get_column(0); renderer = dynamic_cast (sample_format_view.get_column_cell_renderer (0)); label_col->add_attribute(renderer->property_foreground(), sample_format_cols.color); - + dither_type_list = Gtk::ListStore::create (dither_type_cols); dither_type_view.set_model (dither_type_list); dither_type_view.set_headers_visible (false); @@ -481,20 +485,20 @@ ExportFormatDialog::init_encoding_option_widgets () label_col = dither_type_view.get_column(0); renderer = dynamic_cast (dither_type_view.get_column_cell_renderer (0)); label_col->add_attribute(renderer->property_foreground(), dither_type_cols.color); - + } 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); ExportFormatManager::CompatPtr ptr = iter->get_value (compatibility_cols.ptr); bool state = iter->get_value (compatibility_cols.selected); - + iter->set_value (compatibility_cols.selected, state); ptr->set_selected (state); - + } void @@ -537,7 +541,7 @@ ExportFormatDialog::update_selection (Glib::RefPtr & list, Gtk:: Gtk::ListStore::Children::iterator it; Glib::RefPtr selection = view.get_selection(); - + for (it = list->children().begin(); it != list->children().end(); ++it) { bool selected = selection->is_selected (it); it->get_value (cols.ptr)->set_selected (selected); @@ -548,16 +552,16 @@ void ExportFormatDialog::change_compatibility_selection (bool select, WeakCompatPtr compat) { ++applying_changes_from_engine; - + ExportFormatManager::CompatPtr 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) { it->set_value (compatibility_cols.selected, select); break; } } - + --applying_changes_from_engine; } @@ -583,11 +587,11 @@ void ExportFormatDialog::change_sample_rate_selection (bool select, WeakSampleRatePtr rate) { change_selection (select, rate, sample_rate_list, sample_rate_view, sample_rate_cols); - + 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()); } } } @@ -609,14 +613,14 @@ void ExportFormatDialog::change_selection (bool select, boost::weak_ptr w_ptr, Glib::RefPtr & list, Gtk::TreeView & view, ColsT & cols) { ++applying_changes_from_engine; - + boost::shared_ptr ptr = w_ptr.lock(); - + Gtk::ListStore::Children::iterator it; Glib::RefPtr selection; - + selection = view.get_selection(); - + if (!ptr) { selection->unselect_all(); } else { @@ -631,7 +635,7 @@ ExportFormatDialog::change_selection (bool select, boost::weak_ptr w_ptr, Gli } } } - + --applying_changes_from_engine; } @@ -668,10 +672,10 @@ 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(); - + Gtk::ListStore::Children::iterator it; for (it = list->children().begin(); it != list->children().end(); ++it) { if (it->get_value (cols.ptr) == ptr) { @@ -711,7 +715,7 @@ ExportFormatDialog::update_silence_start_selection () { update_time (silence_start, silence_start_clock); AnyTime zero; - zero.type = AnyTime::SMPTE; + zero.type = AnyTime::Timecode; manager.select_silence_beginning (silence_start_checkbox.get_active() ? silence_start : zero); } @@ -720,7 +724,7 @@ ExportFormatDialog::update_silence_end_selection () { update_time (silence_end, silence_end_clock); AnyTime zero; - zero.type = AnyTime::SMPTE; + zero.type = AnyTime::Timecode; manager.select_silence_end (silence_end_checkbox.get_active() ? silence_end : zero); } @@ -728,13 +732,13 @@ void ExportFormatDialog::update_clock (AudioClock & clock, ARDOUR::AnyTime const & time) { // TODO position - clock.set (session->convert_to_frames_at (0, time), true); - - AudioClock::Mode mode(AudioClock::SMPTE); - + clock.set (_session->convert_to_frames_at (0, time), true); + + AudioClock::Mode mode(AudioClock::Timecode); + switch (time.type) { - case AnyTime::SMPTE: - mode = AudioClock::SMPTE; + case AnyTime::Timecode: + mode = AudioClock::Timecode; break; case AnyTime::BBT: mode = AudioClock::BBT; @@ -746,31 +750,31 @@ ExportFormatDialog::update_clock (AudioClock & clock, ARDOUR::AnyTime const & ti mode = AudioClock::MinSec; break; } - + clock.set_mode (mode); } 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::SMPTE: - time.type = AnyTime::SMPTE; - session->smpte_time (frames, time.smpte); + case AudioClock::Timecode: + time.type = AnyTime::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; @@ -778,7 +782,7 @@ ExportFormatDialog::update_time (AnyTime & time, AudioClock const & clock) break; case AudioClock::Off: silence_end_checkbox.set_active (false); - return; + return; } } @@ -837,15 +841,15 @@ ExportFormatDialog::show_linear_enconding_options (boost::shared_ptr (ptr)); - + show_all_children (); } @@ -853,12 +857,12 @@ void ExportFormatDialog::show_ogg_enconding_options (boost::shared_ptr /*ptr*/) { encoding_options_label.set_label (_("Ogg Vorbis options")); - + encoding_options_table.resize (1, 1); encoding_options_table.attach (tag_checkbox, 0, 1, 0, 1); - + update_tagging_selection (); - + show_all_children (); } @@ -866,16 +870,16 @@ void ExportFormatDialog::show_flac_enconding_options (boost::shared_ptr ptr) { encoding_options_label.set_label (_("FLAC options")); - + encoding_options_table.resize (3, 2); encoding_options_table.attach (sample_format_label, 0, 1, 0, 1); encoding_options_table.attach (dither_label, 1, 2, 0, 1); encoding_options_table.attach (sample_format_view, 0, 1, 1, 2); encoding_options_table.attach (dither_type_view, 1, 2, 1, 2); encoding_options_table.attach (tag_checkbox, 0, 2, 2, 3); - + fill_sample_format_lists (boost::dynamic_pointer_cast (ptr)); - + show_all_children (); } @@ -883,15 +887,15 @@ void ExportFormatDialog::show_bwf_enconding_options (boost::shared_ptr ptr) { encoding_options_label.set_label (_("Broadcast Wave options")); - + encoding_options_table.resize (2, 2); encoding_options_table.attach (sample_format_label, 0, 1, 0, 1); encoding_options_table.attach (dither_label, 1, 2, 0, 1); encoding_options_table.attach (sample_format_view, 0, 1, 1, 2); encoding_options_table.attach (dither_type_view, 1, 2, 1, 2); - + fill_sample_format_lists (boost::dynamic_pointer_cast (ptr)); - + show_all_children (); } @@ -899,39 +903,39 @@ void ExportFormatDialog::fill_sample_format_lists (boost::shared_ptr ptr) { /* Fill lists */ - + Gtk::TreeModel::iterator iter; Gtk::TreeModel::Row row; - + sample_format_list->clear (); - + HasSampleFormat::SampleFormatList const & formats = ptr->get_sample_formats (); - + for (HasSampleFormat::SampleFormatList::const_iterator it = formats.begin(); it != formats.end(); ++it) { iter = sample_format_list->append(); row = *iter; - + row[sample_format_cols.ptr] = *it; row[sample_format_cols.color] = (*it)->compatible() ? "white" : "red"; row[sample_format_cols.label] = (*it)->name(); - + if ((*it)->selected()) { sample_format_view.get_selection()->select (iter); } } - + dither_type_list->clear (); - + HasSampleFormat::DitherTypeList const & types = ptr->get_dither_types (); - + for (HasSampleFormat::DitherTypeList::const_iterator it = types.begin(); it != types.end(); ++it) { iter = dither_type_list->append(); row = *iter; - + row[dither_type_cols.ptr] = *it; row[dither_type_cols.color] = "white"; row[dither_type_cols.label] = (*it)->name(); - + if ((*it)->selected()) { dither_type_view.get_selection()->select (iter); }