diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-03-28 19:22:29 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-03-28 19:22:29 +0000 |
| commit | e27ac3278b0d335be0ccd9d6d6373287d406adb5 (patch) | |
| tree | 3e0e812304a7652909f341b1a06b5bedb04a9cb2 /gtk2_ardour/option_editor.cc | |
| parent | 744acb7c16806759743901190d8b38b61475d5be (diff) | |
a) fix problems with multichannel tape tracks
b) separate data format and header format for native audio files
c) expose data/header selections in GUI
d) fix error in file naming for multichannel tape tracks
e) remove blocks on GTK rc files during startup
git-svn-id: svn://localhost/trunk/ardour2@423 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/option_editor.cc')
| -rw-r--r-- | gtk2_ardour/option_editor.cc | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index 11787e942d..130bf37083 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -227,12 +227,6 @@ OptionEditor::~OptionEditor () { } -static const gchar *native_format_strings[] = { - N_("Broadcast WAVE/floating point"), - N_("WAVE/floating point"), - 0 -}; - void OptionEditor::setup_path_options() { @@ -251,11 +245,6 @@ OptionEditor::setup_path_options() path_table.attach (*label, 0, 1, 0, 1, FILL|EXPAND, FILL); path_table.attach (session_raid_entry, 1, 3, 0, 1, Gtk::FILL|Gtk::EXPAND, FILL); - label = manage(new Label(_("Native Format"))); - label->set_name ("OptionsLabel"); - path_table.attach (*label, 0, 1, 1, 2, FILL|EXPAND, FILL); - path_table.attach (native_format_combo, 1, 3, 1, 2, Gtk::FILL|Gtk::EXPAND, FILL); - label = manage(new Label(_("Soundfile Search Paths"))); label->set_name("OptionsLabel"); path_table.attach(*label, 0, 1, 2, 3, FILL|EXPAND, FILL); @@ -264,19 +253,6 @@ OptionEditor::setup_path_options() sfdb_path_view.append_column(_("Paths"), sfdb_path_columns.paths); sfdb_path_view.set_size_request(-1, 100); - vector<string> nfstrings = internationalize (native_format_strings); - - set_popdown_strings (native_format_combo, nfstrings); - native_format_combo.signal_changed().connect (mem_fun(*this, &OptionEditor::native_format_chosen)); - - fixup_combo_size (native_format_combo, nfstrings); - - if (Config->get_native_format_is_bwf()) { - native_format_combo.set_active_text (native_format_strings[0]); - } else { - native_format_combo.set_active_text (native_format_strings[1]); - } - path_table.show_all(); } @@ -780,23 +756,6 @@ OptionEditor::click_emphasis_sound_changed () } void -OptionEditor::native_format_chosen () -{ - string which; - - if (session == 0) { - return; - } - - bool use_bwf = (native_format_combo.get_active_text() == native_format_strings[0]); - - if (use_bwf != Config->get_native_format_is_bwf()) { - Config->set_native_format_is_bwf (use_bwf); - session->reset_native_file_format (); - } -} - -void OptionEditor::clear_click_editor () { if (click_io_selector) { |