X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Foption_editor.cc;h=ad34e8ed0b38449ad117cff0686e1e7c7e4365d4;hb=767984b486086e3682e521179c2fb8364b3bba76;hp=cb4488fe033c241320325edad37ccf5f02855693;hpb=fe83d9b77e0aff0af45d8c9ef4f1d8187b8f600e;p=ardour.git diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index cb4488fe03..ad34e8ed0b 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2001 Paul Davis + Copyright (C) 2001-2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,19 +15,23 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ +#include + #include #include #include #include +#include #include #include #include #include +#include #include "public_editor.h" +#include "keyboard.h" #include "mixer_ui.h" #include "ardour_ui.h" #include "io_selector.h" @@ -40,79 +44,40 @@ #include "i18n.h" using namespace ARDOUR; +using namespace PBD; using namespace Gtk; using namespace Editing; using namespace Gtkmm2ext; using namespace std; -static const gchar *psync_strings[] = { - N_("Internal"), - N_("Slave to MTC"), - N_("Sync with JACK"), - N_("never used but stops crashes"), - 0 -}; - -static const gchar *lmode_strings[] = { - N_("Later regions are higher"), - N_("Most recently added/moved/trimmed regions are higher"), - N_("Most recently added regions are higher"), - 0 -}; - -static const gchar *xfl_strings[] = { - N_("Span entire region overlap"), - N_("Short fades at the start of the overlap"), - 0 -}; - static vector positional_sync_strings; -static vector layer_mode_strings; -static vector xfade_model_strings; OptionEditor::OptionEditor (ARDOUR_UI& uip, PublicEditor& ed, Mixer_UI& mixui) - : ArdourDialog ("option editor"), + : Dialog ("options editor"), ui (uip), editor (ed), mixer (mixui), - path_table (9, 2), + /* Paths */ + path_table (11, 2), /* Fades */ - auto_xfade_button (_("Automatically create crossfades")), - xfade_active_button (_("New full-overlap crossfades are unmuted")), - layer_mode_label (_("Region layering mode")), - xfade_model_label (_("Crossfade model")), short_xfade_adjustment (0, 1.0, 500.0, 5.0, 100.0), short_xfade_slider (short_xfade_adjustment), + destructo_xfade_adjustment (1.0, 1.0, 500.0, 1.0, 100.0), + destructo_xfade_slider (destructo_xfade_adjustment), - /* solo */ - solo_latched_button (_("Latched solo")), - solo_via_bus_button (_("Solo via bus")), - - /* display */ - - show_waveforms_button (_("Show waveforms")), - show_waveforms_recording_button (_("Show waveforms while recording")), - mixer_strip_width_button (_("Narrow mixer strips")), - show_measures_button (_("Show measure lines")), - follow_playhead_button (_("Follow playhead")), - /* Sync */ - send_mtc_button (_("Send MTC")), - send_mmc_button (_("Send MMC")), - jack_time_master_button (_("JACK time master")), - smpte_offset_clock (X_("SMPTEOffsetClock"), true, true), + smpte_offset_clock (X_("smpteoffset"), false, X_("SMPTEOffsetClock"), true, true), smpte_offset_negative_button (_("SMPTE offset is negative")), /* MIDI */ - midi_feedback_button (_("Send MIDI parameter feedback")), - midi_control_button (_("MIDI parameter control")), - mmc_control_button (_("MMC control")), - + mmc_device_id_adjustment (0.0, 0.0, (double) 0x7f, 1.0, 16.0), + mmc_device_id_spinner (mmc_device_id_adjustment), + /* Click */ click_table (2, 3), @@ -125,48 +90,32 @@ OptionEditor::OptionEditor (ARDOUR_UI& uip, PublicEditor& ed, Mixer_UI& mixui) delete_button_adjustment (3, 1, 5), delete_button_spin (delete_button_adjustment), edit_button_adjustment (3, 1, 5), - edit_button_spin (edit_button_adjustment), - - /* Misc */ - - auto_connect_inputs_button (_("Auto-connect new track inputs to hardware")), - auto_connect_output_physical_button (_("Auto-connect new track outputs to hardware")), - auto_connect_output_master_button (_("Auto-connect new track outputs to master bus")), - auto_connect_output_manual_button (_("Manually connect new track outputs")), - hw_monitor_button(_("Use Hardware Monitoring")), - sw_monitor_button(_("Use Software Monitoring")), - plugins_stop_button (_("Stop plugins with transport")), - plugins_on_rec_button (_("Run plugins while recording")), - verify_remove_last_capture_button (_("Verify remove last capture")), - stop_rec_on_xrun_button (_("Stop recording on xrun")), - stop_at_end_button (_("Stop transport at end of session")), - debug_keyboard_button (_("Debug keyboard events")), - speed_quieten_button (_("-12dB gain reduction for ffwd/rew")) + edit_button_spin (edit_button_adjustment) { using namespace Notebook_Helpers; click_io_selector = 0; auditioner_io_selector = 0; + session = 0; + + WindowTitle title(Glib::get_application_name()); + title += _("Options Editor"); + set_title(title.get_string()); set_default_size (300, 300); - set_title (_("ardour: options editor")); - set_wmclass (_("ardour_option_editor"), "Ardour"); + set_wmclass (X_("ardour_option_editor"), "Ardour"); set_name ("OptionsWindow"); add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK); - layer_mode_label.set_name ("OptionsLabel"); - xfade_model_label.set_name ("OptionsLabel"); - - VBox *vbox = manage(new VBox); - add (*vbox); + VBox *vbox = get_vbox(); set_border_width (3); vbox->set_spacing (4); vbox->pack_start(notebook); - delete_event.connect (mem_fun(*this, &OptionEditor::wm_close)); + signal_delete_event().connect (mem_fun(*this, &OptionEditor::wm_close)); notebook.set_show_tabs (true); notebook.set_show_border (true); @@ -175,21 +124,15 @@ OptionEditor::OptionEditor (ARDOUR_UI& uip, PublicEditor& ed, Mixer_UI& mixui) setup_sync_options(); setup_path_options(); setup_fade_options (); - setup_solo_options (); - setup_display_options (); - setup_misc_options (); setup_keyboard_options (); setup_auditioner_editor (); - notebook.pages().push_back (TabElem (misc_packer, _("Misc"))); notebook.pages().push_back (TabElem (sync_packer, _("Sync"))); notebook.pages().push_back (TabElem (path_table, _("Paths/Files"))); - notebook.pages().push_back (TabElem (display_packer, _("Display"))); notebook.pages().push_back (TabElem (keyboard_mouse_table, _("Kbd/Mouse"))); notebook.pages().push_back (TabElem (click_packer, _("Click"))); notebook.pages().push_back (TabElem (audition_packer, _("Audition"))); notebook.pages().push_back (TabElem (fade_packer, _("Layers & Fades"))); - notebook.pages().push_back (TabElem (solo_packer, _("Solo"))); if (!MIDI::Manager::instance()->get_midi_ports().empty()) { setup_midi_options (); @@ -197,6 +140,7 @@ OptionEditor::OptionEditor (ARDOUR_UI& uip, PublicEditor& ed, Mixer_UI& mixui) } set_session (0); + show_all_children(); } void @@ -209,27 +153,10 @@ OptionEditor::set_session (Session *s) click_emphasis_path_entry.set_text (""); session_raid_entry.set_text (""); - send_mtc_button.set_sensitive (false); - send_mmc_button.set_sensitive (false); - midi_feedback_button.set_sensitive (false); - midi_control_button.set_sensitive (false); - mmc_control_button.set_sensitive (false); click_path_entry.set_sensitive (false); click_emphasis_path_entry.set_sensitive (false); session_raid_entry.set_sensitive (false); - plugins_on_rec_button.set_sensitive (false); - verify_remove_last_capture_button.set_sensitive (false); - slave_type_combo.set_sensitive (false); - solo_latched_button.set_sensitive (false); - solo_via_bus_button.set_sensitive (false); - smpte_fps_combo.set_sensitive (false); - meter_hold_combo.set_sensitive (false); - meter_falloff_combo.set_sensitive (false); - auto_connect_inputs_button.set_sensitive (false); - auto_connect_output_physical_button.set_sensitive (false); - auto_connect_output_master_button.set_sensitive (false); - auto_connect_output_manual_button.set_sensitive (false); - layer_mode_combo.set_sensitive (false); + short_xfade_slider.set_sensitive (false); smpte_offset_negative_button.set_sensitive (false); @@ -239,64 +166,20 @@ OptionEditor::set_session (Session *s) return; } - send_mtc_button.set_sensitive (true); - send_mmc_button.set_sensitive (true); - midi_feedback_button.set_sensitive (true); - midi_control_button.set_sensitive (true); - mmc_control_button.set_sensitive (true); click_path_entry.set_sensitive (true); click_emphasis_path_entry.set_sensitive (true); session_raid_entry.set_sensitive (true); - plugins_on_rec_button.set_sensitive (true); - verify_remove_last_capture_button.set_sensitive (true); - slave_type_combo.set_sensitive (true); - solo_latched_button.set_sensitive (true); - solo_via_bus_button.set_sensitive (true); - smpte_fps_combo.set_sensitive (true); - meter_hold_combo.set_sensitive (true); - meter_falloff_combo.set_sensitive (true); - auto_connect_inputs_button.set_sensitive (true); - auto_connect_output_physical_button.set_sensitive (true); - auto_connect_output_master_button.set_sensitive (true); - auto_connect_output_manual_button.set_sensitive (true); - layer_mode_combo.set_sensitive (true); short_xfade_slider.set_sensitive (true); smpte_offset_negative_button.set_sensitive (true); - if (!s->smpte_drop_frames) { - // non-drop frames - if (s->smpte_frames_per_second == 24.0) - smpte_fps_combo.get_entry ()->set_text (_("24 FPS")); - else if (s->smpte_frames_per_second == 25.0) - smpte_fps_combo.get_entry ()->set_text (_("25 FPS")); - else if (s->smpte_frames_per_second == 30.0) - smpte_fps_combo.get_entry ()->set_text (_("30 FPS")); - else - smpte_fps_combo.get_entry ()->set_text (_("???")); - } else { - // drop frames - if (floor(s->smpte_frames_per_second) == 29.0) - smpte_fps_combo.get_entry ()->set_text (_("30 FPS drop")); - else - smpte_fps_combo.get_entry ()->set_text (_("???")); - } - smpte_offset_clock.set_session (s); smpte_offset_clock.set (s->smpte_offset (), true); smpte_offset_negative_button.set_active (session->smpte_offset_negative()); - send_mtc_button.set_active (session->get_send_mtc()); - - /* MIDI I/O */ - - send_mmc_button.set_active (session->get_send_mmc()); - midi_control_button.set_active (session->get_midi_control()); - midi_feedback_button.set_active (session->get_midi_feedback()); - mmc_control_button.set_active (session->get_mmc_control()); /* set up port assignments */ - map >::iterator res; + std::map >::iterator res; if (session->mtc_port()) { if ((res = port_toggle_buttons.find (session->mtc_port())) != port_toggle_buttons.end()) { @@ -316,128 +199,36 @@ OptionEditor::set_session (Session *s) } } - auto_connect_inputs_button.set_active (session->get_input_auto_connect()); - - Session::AutoConnectOption oac = session->get_output_auto_connect(); - if (oac & Session::AutoConnectPhysical) { - auto_connect_output_physical_button.set_active (true); - } else if (oac & Session::AutoConnectMaster) { - auto_connect_output_master_button.set_active (true); - } else { - auto_connect_output_manual_button.set_active (true); - } - setup_click_editor (); connect_audition_editor (); - plugins_on_rec_button.set_active (session->get_recording_plugins ()); - verify_remove_last_capture_button.set_active (Config->get_verify_remove_last_capture()); - - layer_mode_combo.get_entry()->set_text (layer_mode_strings[session->get_layer_model()]); - xfade_model_combo.get_entry()->set_text (xfade_model_strings[session->get_xfade_model()]); - short_xfade_adjustment.set_value ((Crossfade::short_xfade_length() / (float) session->frame_rate()) * 1000.0); - xfade_active_button.set_active (session->get_crossfades_active()); - solo_latched_button.set_active (session->solo_latched()); - solo_via_bus_button.set_active (session->solo_model() == Session::SoloBus); - add_session_paths (); - - vector dumb; - dumb.push_back (positional_sync_strings[Session::None]); - dumb.push_back (positional_sync_strings[Session::JACK]); - if (session->mtc_port()) { - dumb.push_back (positional_sync_strings[Session::MTC]); - } - set_popdown_strings (slave_type_combo, dumb); - - // meter stuff - if (session->meter_falloff() == 0.0f) { - meter_falloff_combo.get_entry ()->set_text (_("Off")); - } else if (session->meter_falloff() <= 0.3f) { - meter_falloff_combo.get_entry ()->set_text (_("Slowest")); - } else if (session->meter_falloff() <= 0.4f) { - meter_falloff_combo.get_entry ()->set_text (_("Slow")); - } else if (session->meter_falloff() <= 0.8f) { - meter_falloff_combo.get_entry ()->set_text (_("Medium")); - } else if (session->meter_falloff() <= 1.4f) { - meter_falloff_combo.get_entry ()->set_text (_("Fast")); - } else if (session->meter_falloff() <= 2.0f) { - meter_falloff_combo.get_entry ()->set_text (_("Faster")); - } else { - meter_falloff_combo.get_entry ()->set_text (_("Fastest")); - } - - switch ((int) floor (session->meter_hold())) { - case 0: - meter_hold_combo.get_entry ()->set_text (_("Off")); - break; - case 40: - meter_hold_combo.get_entry ()->set_text (_("Short")); - break; - case 100: - meter_hold_combo.get_entry ()->set_text (_("Medium")); - break; - case 200: - meter_hold_combo.get_entry ()->set_text (_("Long")); - break; - } - - session_control_changed (Session::SlaveType); - session_control_changed (Session::AlignChoice); - session->ControlChanged.connect (mem_fun(*this, &OptionEditor::queue_session_control_changed)); } OptionEditor::~OptionEditor () { } -static const gchar *native_format_strings[] = { - N_("Broadcast WAVE/floating point"), - N_("WAVE/floating point"), - 0 -}; - void OptionEditor::setup_path_options() { Gtk::Label* label; - path_table.set_homogeneous (true); + path_table.set_homogeneous (false); path_table.set_border_width (12); path_table.set_row_spacings (5); session_raid_entry.set_name ("OptionsEntry"); - session_raid_entry.activate.connect (mem_fun(*this, &OptionEditor::raid_path_changed)); - - session_raid_entry.signal_focus_in_event()().connect (mem_fun (Keyboard::the_keyboard(), &Keyboard::focus_in_handler)); - session_raid_entry.signal_focus_out_event()().connect (bind (mem_fun(*this, &OptionEditor::focus_out_event_handler), &OptionEditor::raid_path_changed)); + session_raid_entry.signal_activate().connect (mem_fun(*this, &OptionEditor::raid_path_changed)); label = manage(new Label(_("session RAID path"))); label->set_name ("OptionsLabel"); - path_table.attach (*label, 0, 1, 0, 1, 0, 0); - path_table.attach (session_raid_entry, 1, 3, 0, 1, Gtk::FILL|Gtk::EXPAND, 0); - - label = manage(new Label(_("Native Format"))); - label->set_name ("OptionsLabel"); - path_table.attach (*label, 0, 1, 1, 2, 0, 0); - path_table.attach (native_format_combo, 1, 3, 1, 2, Gtk::FILL|Gtk::EXPAND, 0); - - vector nfstrings = internationalize (native_format_strings); + 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); - set_popdown_strings (native_format_combo, nfstrings); - native_format_combo.get_popwin()->signal_unmap_event().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.get_entry()->set_text (native_format_strings[0]); - } else { - native_format_combo.get_entry()->set_text (native_format_strings[1]); - } - path_table.show_all(); } @@ -448,16 +239,16 @@ OptionEditor::add_session_paths () click_emphasis_path_entry.set_sensitive (true); session_raid_entry.set_sensitive (true); - if (session->click_sound.length() == 0) { + if (Config->get_click_sound().empty()) { click_path_entry.set_text (_("internal")); } else { - click_path_entry.set_text (session->click_sound); + click_path_entry.set_text (Config->get_click_sound()); } - if (session->click_emphasis_sound.length() == 0) { + if (Config->get_click_emphasis_sound().empty()) { click_emphasis_path_entry.set_text (_("internal")); } else { - click_emphasis_path_entry.set_text (session->click_emphasis_sound); + click_emphasis_path_entry.set_text (Config->get_click_emphasis_sound()); } session_raid_entry.set_text(session->raid_path()); @@ -467,74 +258,35 @@ void OptionEditor::setup_fade_options () { Gtk::HBox* hbox; - vector dumb; - auto_xfade_button.set_name ("OptionEditorToggleButton"); - xfade_active_button.set_name ("OptionEditorToggleButton"); - - hbox = manage (new HBox); - hbox->set_border_width (12); - hbox->pack_start (auto_xfade_button, false, false); - fade_packer.pack_start (*hbox, false, false); - - hbox = manage (new HBox); - hbox->set_border_width (12); - hbox->pack_start (xfade_active_button, false, false); - fade_packer.pack_start (*hbox, false, false); - - layer_mode_strings = internationalize (lmode_strings); - - dumb.push_back (lmode_strings[Session::LaterHigher]); - dumb.push_back (lmode_strings[Session::MoveAddHigher]); - dumb.push_back (lmode_strings[Session::AddHigher]); - set_popdown_strings (layer_mode_combo, dumb); - - layer_mode_combo.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &OptionEditor::layer_mode_chosen)); - - fixup_combo_size (layer_mode_combo, layer_mode_strings); - - hbox = manage (new HBox); - hbox->set_border_width (5); - hbox->set_spacing (10); - hbox->pack_start (layer_mode_label, false, false); - hbox->pack_start (layer_mode_combo, false, false); - fade_packer.pack_start (*hbox, false, false); - - xfade_model_strings = internationalize (xfl_strings); - - dumb.clear (); - dumb.push_back (xfade_model_strings[FullCrossfade]); - dumb.push_back (xfade_model_strings[ShortCrossfade]); - set_popdown_strings (xfade_model_combo, dumb); - - xfade_model_combo.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &OptionEditor::xfade_model_chosen)); - - fixup_combo_size (xfade_model_combo, xfade_model_strings); - + Label* label = manage (new Label (_("Short crossfade length (msecs)"))); + label->set_name ("OptionsLabel"); + hbox = manage (new HBox); hbox->set_border_width (5); hbox->set_spacing (10); - hbox->pack_start (xfade_model_label, false, false); - hbox->pack_start (xfade_model_combo, false, false); + hbox->pack_start (*label, false, false); + hbox->pack_start (short_xfade_slider, true, true); fade_packer.pack_start (*hbox, false, false); - auto_xfade_button.set_active (Config->get_auto_xfade()); - /* xfade and layer mode active requires session */ + short_xfade_adjustment.signal_value_changed().connect (mem_fun(*this, &OptionEditor::short_xfade_adjustment_changed)); - auto_xfade_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::auto_xfade_clicked)); - xfade_active_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::xfade_active_clicked)); - - Label* short_xfade_label = manage (new Label (_("Short crossfade length (msecs)"))); - short_xfade_label->set_name ("OptionsLabel"); + label = manage (new Label (_("Destructive crossfade length (msecs)"))); + label->set_name ("OptionsLabel"); hbox = manage (new HBox); hbox->set_border_width (5); hbox->set_spacing (10); - hbox->pack_start (*short_xfade_label, false, false); - hbox->pack_start (short_xfade_slider, true, true); + hbox->pack_start (*label, false, false); + hbox->pack_start (destructo_xfade_slider, true, true); fade_packer.pack_start (*hbox, false, false); + + destructo_xfade_adjustment.signal_value_changed().connect (mem_fun(*this, &OptionEditor::destructo_xfade_adjustment_changed)); + + short_xfade_slider.set_update_policy (UPDATE_DISCONTINUOUS); + destructo_xfade_slider.set_update_policy (UPDATE_DISCONTINUOUS); - short_xfade_adjustment.value_changed.connect (mem_fun(*this, &OptionEditor::short_xfade_adjustment_changed)); + destructo_xfade_adjustment.set_value (Config->get_destructive_xfade_msecs()); fade_packer.show_all (); } @@ -547,349 +299,41 @@ OptionEditor::short_xfade_adjustment_changed () /* val is in msecs */ - Crossfade::set_short_xfade_length ((jack_nframes_t) floor (session->frame_rate() * (val / 1000.0))); - } -} - -gint -OptionEditor::layer_mode_chosen (GdkEventAny* ev) -{ - if (!session) { - return FALSE; - } - - string which = layer_mode_combo.get_entry()->get_text (); - - if (which == layer_mode_strings[Session::LaterHigher]) { - session->set_layer_model (Session::LaterHigher); - } else if (which == layer_mode_strings[Session::MoveAddHigher]) { - session->set_layer_model (Session::MoveAddHigher); - } else if (which == layer_mode_strings[Session::AddHigher]) { - session->set_layer_model (Session::AddHigher); - } - return FALSE; -} - -gint -OptionEditor::xfade_model_chosen (GdkEventAny* ev) -{ - if (!session) { - return FALSE; - } - - string which = xfade_model_combo.get_entry()->get_text (); - - if (which == xfade_model_strings[FullCrossfade]) { - session->set_xfade_model (FullCrossfade); - } else if (which == xfade_model_strings[ShortCrossfade]) { - session->set_xfade_model (ShortCrossfade); - } - return FALSE; -} - -void -OptionEditor::auto_xfade_clicked () -{ - Config->set_auto_xfade (auto_xfade_button.get_active()); -} - -void -OptionEditor::xfade_active_clicked () -{ - if (session) { - session->set_crossfades_active (xfade_active_button.get_active()); - } -} - -void -OptionEditor::setup_solo_options () -{ - Gtk::HBox* hbox; - - solo_via_bus_button.set_name ("OptionEditorToggleButton"); - solo_latched_button.set_name ("OptionEditorToggleButton"); - - hbox = manage (new HBox); - hbox->set_border_width (12); - hbox->pack_start (solo_via_bus_button, false, false); - solo_packer.pack_start (*hbox, false, false); - - hbox = manage (new HBox); - hbox->set_border_width (12); - hbox->pack_start (solo_latched_button, false, false); - solo_packer.pack_start (*hbox, false, false); - - solo_via_bus_button.signal_clicked().connect - (mem_fun(*this, &OptionEditor::solo_via_bus_clicked)); - solo_latched_button.signal_clicked().connect - (mem_fun(*this, &OptionEditor::solo_latched_clicked)); - - solo_packer.show_all (); -} - -void -OptionEditor::solo_via_bus_clicked () -{ - if (!session) { - return; - } - - if (solo_via_bus_button.get_active()) { - session->set_solo_model (Session::SoloBus); - } else { - session->set_solo_model (Session::InverseMute); - } -} - -void -OptionEditor::solo_latched_clicked () -{ - if (!session) { - return; - } - - bool x = solo_latched_button.get_active(); - - if (x != session->solo_latched()) { - session->set_solo_latched (x); + Crossfade::set_short_xfade_length ((nframes_t) floor (session->frame_rate() * (val / 1000.0))); } } void -OptionEditor::setup_display_options () +OptionEditor::destructo_xfade_adjustment_changed () { - HBox* hbox; - vector dumb; - - display_packer.set_border_width (12); - display_packer.set_spacing (5); - - show_waveforms_button.set_name ("OptionEditorToggleButton"); - show_waveforms_recording_button.set_name ("OptionEditorToggleButton"); - show_measures_button.set_name ("OptionEditorToggleButton"); - follow_playhead_button.set_name ("OptionEditorToggleButton"); - mixer_strip_width_button.set_name ("OptionEditorToggleButton"); - - mixer_strip_width_button.set_active (mixer.get_strip_width() == Narrow); - - hbox = manage (new HBox); - hbox->set_border_width (8); - hbox->pack_start (show_waveforms_button, false, false); - display_packer.pack_start (*hbox, false, false); + float val = destructo_xfade_adjustment.get_value(); - hbox = manage (new HBox); - hbox->set_border_width (8); - hbox->pack_start (show_waveforms_recording_button, false, false); - display_packer.pack_start (*hbox, false, false); - - hbox = manage (new HBox); - hbox->set_border_width (8); - hbox->pack_start (show_measures_button, false, false); - display_packer.pack_start (*hbox, false, false); + /* val is in msecs */ - hbox = manage (new HBox); - hbox->set_border_width (8); - hbox->pack_start (mixer_strip_width_button, false, false); - display_packer.pack_start (*hbox, false, false); - - hbox = manage (new HBox); - hbox->set_border_width (8); - hbox->pack_start (follow_playhead_button, false, false); - display_packer.pack_start (*hbox, false, false); - - Label *meter_hold_label = manage (new Label (_("Meter Peak Hold"))); - meter_hold_label->set_name ("OptionsLabel"); - dumb.clear (); - dumb.push_back (_("Off")); - dumb.push_back (_("Short")); - dumb.push_back (_("Medium")); - dumb.push_back (_("Long")); - set_popdown_strings (meter_hold_combo, dumb); - meter_hold_combo.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &OptionEditor::meter_hold_chosen)); - hbox = manage (new HBox); - hbox->set_border_width (8); - hbox->set_spacing (8); - hbox->pack_start (*meter_hold_label, false, false); - hbox->pack_start (meter_hold_combo, false, false); - display_packer.pack_start (*hbox, false, false); - - Label *meter_falloff_label = manage (new Label (_("Meter Falloff"))); - meter_falloff_label->set_name ("OptionsLabel"); - dumb.clear (); - dumb.push_back (_("Off")); - dumb.push_back (_("Slowest")); - dumb.push_back (_("Slow")); - dumb.push_back (_("Medium")); - dumb.push_back (_("Fast")); - dumb.push_back (_("Faster")); - dumb.push_back (_("Fastest")); - set_popdown_strings (meter_falloff_combo, dumb); - meter_falloff_combo.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &OptionEditor::meter_falloff_chosen)); - hbox = manage (new HBox); - hbox->set_border_width (8); - hbox->set_spacing (8); - hbox->pack_start (*meter_falloff_label, false, false); - hbox->pack_start (meter_falloff_combo, false, false); - display_packer.pack_start (*hbox, false, false); - - show_waveforms_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::show_waveforms_clicked)); - show_waveforms_recording_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::show_waveforms_recording_clicked)); - show_measures_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::show_measures_clicked)); - mixer_strip_width_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::strip_width_clicked)); - follow_playhead_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::follow_playhead_clicked)); - - editor.DisplayControlChanged.connect (mem_fun(*this, &OptionEditor::display_control_changed)); - - show_measures_button.set_active (editor.show_measures()); - show_waveforms_button.set_active (editor.show_waveforms()); - show_waveforms_recording_button.set_active (editor.show_waveforms_recording()); - follow_playhead_button.set_active (editor.follow_playhead()); -} - -gint -OptionEditor::meter_hold_chosen (GdkEventAny* ev) -{ - if (session) { - string str = meter_hold_combo.get_entry()->get_text(); - - if (str == _("Off")) { - session->set_meter_hold (0); - } else if (str == _("Short")) { - session->set_meter_hold (40); - } else if (str == _("Medium")) { - session->set_meter_hold (100); - } else if (str == _("Long")) { - session->set_meter_hold (200); - } - } + Config->set_destructive_xfade_msecs ((uint32_t) floor (val)); - return TRUE; -} - -gint -OptionEditor::meter_falloff_chosen (GdkEventAny* ev) -{ if (session) { - string str = meter_falloff_combo.get_entry()->get_text(); - - if (str == _("Off")) { - session->set_meter_falloff (0.0f); - } else if (str == _("Slowest")) { - session->set_meter_falloff (0.266f); // 6.6 dB/sec falloff at update rate of 40 ms - } else if (str == _("Slow")) { - session->set_meter_falloff (0.342f); // 8.6 dB/sec falloff at update rate of 40 ms - } else if (str == _("Medium")) { - session->set_meter_falloff (0.7f); - } else if (str == _("Fast")) { - session->set_meter_falloff (1.1f); - } else if (str == _("Faster")) { - session->set_meter_falloff (1.5f); - } else if (str == _("Fastest")) { - session->set_meter_falloff (2.5f); - } - } - - return TRUE; -} - -void -OptionEditor::display_control_changed (Editing::DisplayControl dc) -{ - ToggleButton* button = 0; - bool val = true; - - switch (dc) { - case ShowMeasures: - val = editor.show_measures (); - button = &show_measures_button; - break; - case ShowWaveforms: - val = editor.show_waveforms (); - button = &show_waveforms_button; - break; - case ShowWaveformsRecording: - val = editor.show_waveforms_recording (); - button = &show_waveforms_recording_button; - break; - case FollowPlayhead: - val = editor.follow_playhead (); - button = &follow_playhead_button; - break; - } - - if (button->get_active() != val) { - button->set_active (val); - } + SndFileSource::setup_standard_crossfades (session->frame_rate()); + } } void OptionEditor::setup_sync_options () { - Label *slave_type_label = manage (new Label (_("Positional Sync"))); HBox* hbox; vector dumb; - slave_type_label->set_name("OptionsLabel"); - positional_sync_strings = internationalize (psync_strings); - - slave_type_combo.set_use_arrows_always (true); - slave_type_combo.set_value_in_list (true, false); - slave_type_combo.get_entry()->set_editable (false); - slave_type_combo.get_entry()->set_name ("OptionsEntry"); - slave_type_combo.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &OptionEditor::slave_type_chosen)); - - dumb.clear (); - dumb.push_back (X_("24 FPS")); - dumb.push_back (X_("25 FPS")); - dumb.push_back (X_("30 FPS drop")); - dumb.push_back (X_("30 FPS non-drop")); - - set_popdown_strings (smpte_fps_combo, dumb); - smpte_fps_combo.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &OptionEditor::smpte_fps_chosen)); - smpte_offset_clock.set_mode (AudioClock::SMPTE); smpte_offset_clock.ValueChanged.connect (mem_fun(*this, &OptionEditor::smpte_offset_chosen)); - send_mtc_button.set_name ("OptionEditorToggleButton"); - jack_time_master_button.set_name ("OptionEditorToggleButton"); smpte_offset_negative_button.set_name ("OptionEditorToggleButton"); - send_mtc_button.unset_flags (Gtk::CAN_FOCUS); - jack_time_master_button.unset_flags (Gtk::CAN_FOCUS); smpte_offset_negative_button.unset_flags (Gtk::CAN_FOCUS); - hbox = manage (new HBox); - hbox->set_border_width (5); - hbox->set_spacing (10); - hbox->pack_start (*slave_type_label, false, false); - hbox->pack_start (slave_type_combo, false, false); - - sync_packer.pack_start (*hbox, false, false); - - hbox = manage (new HBox); - hbox->set_border_width (5); - hbox->pack_start (send_mtc_button, false, false); - sync_packer.pack_start (*hbox, false, false); - - hbox = manage (new HBox); - hbox->set_border_width (5); - hbox->pack_start (jack_time_master_button, false, false); - sync_packer.pack_start (*hbox, false, false); - - Label *smpte_fps_label = manage (new Label (_("SMPTE Frames/second"))); Label *smpte_offset_label = manage (new Label (_("SMPTE Offset"))); - smpte_fps_label->set_name("OptionsLabel"); smpte_offset_label->set_name("OptionsLabel"); - hbox = manage (new HBox); - hbox->set_border_width (5); - hbox->set_spacing (10); - hbox->pack_start (*smpte_fps_label, false, false); - hbox->pack_start (smpte_fps_combo, false, false); - - sync_packer.pack_start (*hbox, false, false); - hbox = manage (new HBox); hbox->set_border_width (5); hbox->set_spacing (10); @@ -899,10 +343,6 @@ OptionEditor::setup_sync_options () sync_packer.pack_start (*hbox, false, false); - jack_time_master_button.set_active (Config->get_jack_time_master()); - - send_mtc_button.signal_button_press_event().connect (bind (mem_fun(*this, &OptionEditor::send_mtc_toggled), &send_mtc_button)); - jack_time_master_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::jack_time_master_clicked)); smpte_offset_negative_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::smpte_offset_negative_clicked)); } @@ -914,31 +354,11 @@ OptionEditor::smpte_offset_negative_clicked () } } -gint -OptionEditor::smpte_fps_chosen (GdkEventAny* ev) -{ - if (session) { - string str = smpte_fps_combo.get_entry()->get_text(); - - if (str == X_("24 FPS")) { - session->set_smpte_type (24.0, false); - } else if (str == X_("25 FPS")) { - session->set_smpte_type (25.0, false); - } else if (str == X_("30 FPS drop")) { - session->set_smpte_type (29.97, true); - } else if (str == X_("30 FPS non-drop")) { - session->set_smpte_type (30.0, false); - } - } - - return TRUE; -} - void OptionEditor::smpte_offset_chosen() { if (session) { - jack_nframes_t frames = smpte_offset_clock.current_duration(); + nframes_t frames = smpte_offset_clock.current_duration(); session->set_smpte_offset (frames); } } @@ -953,34 +373,36 @@ OptionEditor::setup_midi_options () int n; ToggleButton* tb; RadioButton* rb; - RadioButton* first_mtc_button = 0; - RadioButton* first_mmc_button = 0; - RadioButton* first_midi_button = 0; - Gtk::Table* table = manage (new Table (ports.size() + 4, 9)); + Gtk::Table* table = manage (new Table (ports.size() + 4, 10)); table->set_row_spacings (6); table->set_col_spacings (10); - table->attach (*(manage (new Label (X_("Port")))), 0, 1, 0, 1); - table->attach (*(manage (new Label (X_("Offline")))), 1, 2, 0, 1); - table->attach (*(manage (new Label (X_("Trace\nInput")))), 2, 3, 0, 1); - table->attach (*(manage (new Label (X_("Trace\nOutput")))), 3, 4, 0, 1); - table->attach (*(manage (new Label (X_("MTC")))), 4, 5, 0, 1); - table->attach (*(manage (new Label (X_("MMC")))), 6, 7, 0, 1); - table->attach (*(manage (new Label (X_("MIDI Parameter\nControl")))), 8, 9, 0, 1); + table->attach (*(manage (new Label (_("Port")))), 0, 1, 0, 1); + table->attach (*(manage (new Label (_("Offline")))), 1, 2, 0, 1); + table->attach (*(manage (new Label (_("Trace\nInput")))), 2, 3, 0, 1); + table->attach (*(manage (new Label (_("Trace\nOutput")))), 3, 4, 0, 1); + table->attach (*(manage (new Label (_("MTC")))), 4, 5, 0, 1); + table->attach (*(manage (new Label (_("MMC")))), 6, 7, 0, 1); + table->attach (*(manage (new Label (_("MIDI Parameter\nControl")))), 8, 9, 0, 1); table->attach (*(manage (new HSeparator())), 0, 9, 1, 2); table->attach (*(manage (new VSeparator())), 5, 6, 0, 8); table->attach (*(manage (new VSeparator())), 7, 8, 0, 8); + table->attach (*(manage (new Label (_("MMC Device ID")))), 9, 10, 0, 1); + table->attach (mmc_device_id_spinner, 9, 10, 1, 2); + + mmc_device_id_adjustment.signal_value_changed().connect (mem_fun (*this, &OptionEditor::mmc_device_id_adjusted)); + for (n = 0, i = ports.begin(); i != ports.end(); ++n, ++i) { pair > newpair; newpair.first = i->second; - table->attach (*(manage (new Label (i->first))), 0, 1, n+2, n+3, 0, 0); + table->attach (*(manage (new Label (i->first))), 0, 1, n+2, n+3,FILL|EXPAND, FILL ); tb = manage (new ToggleButton (_("online"))); tb->set_name ("OptionEditorToggleButton"); @@ -995,32 +417,33 @@ OptionEditor::setup_midi_options () } tb->set_active (!(*i).second->input()->offline()); - tb->signal_button_press_event().connect (bind (mem_fun(*this, &OptionEditor::port_online_toggled), (*i).second, tb)); + tb->signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::port_online_toggled), (*i).second, tb)); (*i).second->input()->OfflineStatusChanged.connect (bind (mem_fun(*this, &OptionEditor::map_port_online), (*i).second, tb)); - table->attach (*tb, 1, 2, n+2, n+3, 0, 0); + table->attach (*tb, 1, 2, n+2, n+3, FILL|EXPAND, FILL); tb = manage (new ToggleButton ()); tb->set_name ("OptionEditorToggleButton"); - tb->signal_button_press_event().connect (bind (mem_fun(*this, &OptionEditor::port_trace_in_toggled), (*i).second, tb)); + tb->signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::port_trace_in_toggled), (*i).second, tb)); tb->set_size_request (10, 10); - table->attach (*tb, 2, 3, n+2, n+3, 0, 0); + table->attach (*tb, 2, 3, n+2, n+3, FILL|EXPAND, FILL); tb = manage (new ToggleButton ()); tb->set_name ("OptionEditorToggleButton"); - tb->signal_button_press_event().connect (bind (mem_fun(*this, &OptionEditor::port_trace_out_toggled), (*i).second, tb)); + tb->signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::port_trace_out_toggled), (*i).second, tb)); tb->set_size_request (10, 10); - table->attach (*tb, 3, 4, n+2, n+3, 0, 0); + table->attach (*tb, 3, 4, n+2, n+3, FILL|EXPAND, FILL); rb = manage (new RadioButton ()); newpair.second.push_back (rb); rb->set_name ("OptionEditorToggleButton"); if (n == 0) { - first_mtc_button = rb; + mtc_button_group = rb->get_group(); } else { - rb->set_group (first_mtc_button->group()); + rb->set_group (mtc_button_group); + } - table->attach (*rb, 4, 5, n+2, n+3, 0, 0); - rb->signal_button_press_event().connect (bind (mem_fun(*this, &OptionEditor::mtc_port_chosen), (*i).second, rb)); + table->attach (*rb, 4, 5, n+2, n+3, FILL|EXPAND, FILL); + rb->signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::mtc_port_chosen), (*i).second, rb)); if (Config->get_mtc_port_name() == i->first) { rb->set_active (true); @@ -1030,12 +453,12 @@ OptionEditor::setup_midi_options () newpair.second.push_back (rb); rb->set_name ("OptionEditorToggleButton"); if (n == 0) { - first_mmc_button = rb; + mmc_button_group = rb->get_group(); } else { - rb->set_group (first_mmc_button->group()); + rb->set_group (mmc_button_group); } - table->attach (*rb, 6, 7, n+2, n+3, 0, 0); - rb->signal_button_press_event().connect (bind (mem_fun(*this, &OptionEditor::mmc_port_chosen), (*i).second, rb)); + table->attach (*rb, 6, 7, n+2, n+3, FILL|EXPAND, FILL); + rb->signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::mmc_port_chosen), (*i).second, rb)); if (Config->get_mmc_port_name() == i->first) { rb->set_active (true); @@ -1045,12 +468,12 @@ OptionEditor::setup_midi_options () newpair.second.push_back (rb); rb->set_name ("OptionEditorToggleButton"); if (n == 0) { - first_midi_button = rb; + midi_button_group = rb->get_group(); } else { - rb->set_group (first_midi_button->group()); + rb->set_group (midi_button_group); } - table->attach (*rb, 8, 9, n+2, n+3, 0, 0); - rb->signal_button_press_event().connect (bind (mem_fun(*this, &OptionEditor::midi_port_chosen), (*i).second, rb)); + table->attach (*rb, 8, 9, n+2, n+3, FILL|EXPAND, FILL); + rb->signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::midi_port_chosen), (*i).second, rb)); if (Config->get_midi_port_name() == i->first) { rb->set_active (true); @@ -1065,80 +488,29 @@ OptionEditor::setup_midi_options () hbox->set_border_width (6); hbox->pack_start (*table, true, false); midi_packer.pack_start (*hbox, false, false); - - VBox* mmcbuttonbox = manage (new VBox); - - mmc_control_button.set_name ("OptionEditorToggleButton"); - - hbox = manage (new HBox); - hbox->set_border_width (6); - hbox->pack_start (mmc_control_button, false, false, 36); - mmcbuttonbox->pack_start (*hbox, false, false); - - midi_control_button.set_name ("OptionEditorToggleButton"); - - hbox = manage (new HBox); - hbox->set_border_width (6); - hbox->pack_start (midi_control_button, false, false, 36); - mmcbuttonbox->pack_start (*hbox, false, false); - - send_mmc_button.set_name ("OptionEditorToggleButton"); - - hbox = manage (new HBox); - hbox->set_border_width (6); - hbox->pack_start (send_mmc_button, false, false, 36); - mmcbuttonbox->pack_start (*hbox, false, false); - - midi_feedback_button.set_name ("OptionEditorToggleButton"); - - hbox = manage (new HBox); - hbox->set_border_width (6); - hbox->pack_start (midi_feedback_button, false, false, 36); - mmcbuttonbox->pack_start (*hbox, false, false); - - midi_packer.pack_start (*mmcbuttonbox, false, false); - - mmc_control_button.signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::mmc_control_toggled), &mmc_control_button)); - midi_control_button.signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::midi_control_toggled), &midi_control_button)); - send_mmc_button.signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::send_mmc_toggled), &send_mmc_button)); - midi_feedback_button.signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::midi_feedback_toggled), &midi_feedback_button)); } -gint -OptionEditor::mtc_port_chosen (GdkEventButton* ev, MIDI::Port *port, Gtk::RadioButton* rb) +void +OptionEditor::mtc_port_chosen (MIDI::Port *port, Gtk::RadioButton* rb) { if (session) { - if (!rb->get_active()) { + if (rb->get_active()) { if (port) { session->set_mtc_port (port->name()); Config->set_mtc_port_name (port->name()); } else { session->set_mtc_port (""); } - - /* update sync options to reflect MTC port availability */ - - vector dumb; - dumb.push_back (positional_sync_strings[Session::None]); - dumb.push_back (positional_sync_strings[Session::JACK]); - - if (session->mtc_port()) { - dumb.push_back (positional_sync_strings[Session::MTC]); - } - set_popdown_strings (slave_type_combo, dumb); - rb->set_active (true); } } - - return stop_signal (*rb, "button_press_event"); } -gint -OptionEditor::mmc_port_chosen (GdkEventButton* ev, MIDI::Port* port, Gtk::RadioButton* rb) +void +OptionEditor::mmc_port_chosen (MIDI::Port* port, Gtk::RadioButton* rb) { if (session) { - if (!rb->get_active()) { + if (rb->get_active()) { if (port) { session->set_mmc_port (port->name()); Config->set_mtc_port_name (port->name()); @@ -1148,14 +520,13 @@ OptionEditor::mmc_port_chosen (GdkEventButton* ev, MIDI::Port* port, Gtk::RadioB rb->set_active (true); } } - return stop_signal (*rb, "button_press_event"); } -gint -OptionEditor::midi_port_chosen (GdkEventButton* ev, MIDI::Port* port, Gtk::RadioButton* rb) +void +OptionEditor::midi_port_chosen (MIDI::Port* port, Gtk::RadioButton* rb) { if (session) { - if (!rb->get_active()) { + if (rb->get_active()) { if (port) { session->set_midi_port (port->name()); Config->set_midi_port_name (port->name()); @@ -1165,90 +536,61 @@ OptionEditor::midi_port_chosen (GdkEventButton* ev, MIDI::Port* port, Gtk::Radio rb->set_active (true); } } - return stop_signal (*rb, "button_press_event"); } -gint -OptionEditor::port_online_toggled (GdkEventButton* ev, MIDI::Port* port, ToggleButton* tb) +void +OptionEditor::port_online_toggled (MIDI::Port* port, ToggleButton* tb) { - bool wanted = tb->get_active(); /* it hasn't changed at this point */ + bool wanted = tb->get_active(); if (wanted != port->input()->offline()) { port->input()->set_offline (wanted); } - return stop_signal (*tb, "button_press_event"); } void OptionEditor::map_port_online (MIDI::Port* port, ToggleButton* tb) { - if (port->input()->offline()) { - static_cast(tb->get_child())->set_text (_("offline")); - tb->set_active (false); - } else { - static_cast(tb->get_child())->set_text (_("online")); - tb->set_active (true); - } -} - -gint -OptionEditor::port_trace_in_toggled (GdkEventButton* ev, MIDI::Port* port, ToggleButton* tb) -{ - /* XXX not very good MVC style here */ - - port->input()->trace (!tb->get_active(), &cerr, string (port->name()) + string (" input: ")); - tb->set_active (!tb->get_active()); - return stop_signal (*tb, "button_press_event"); -} - -gint -OptionEditor::port_trace_out_toggled (GdkEventButton* ev,MIDI::Port* port, ToggleButton* tb) -{ - /* XXX not very good MVC style here */ - - port->output()->trace (!tb->get_active(), &cerr, string (port->name()) + string (" output: ")); - tb->set_active (!tb->get_active()); - return stop_signal (*tb, "button_press_event"); -} + bool bstate = tb->get_active (); -gint -OptionEditor::send_mtc_toggled (GdkEventButton *ev, CheckButton *button) -{ - if (session) { - session->set_send_mtc (!button->get_active()); + if (bstate != port->input()->offline()) { + if (port->input()->offline()) { + tb->set_label (_("offline")); + tb->set_active (false); + } else { + tb->set_label (_("online")); + tb->set_active (true); + } } - return stop_signal (*button, "button_press_event"); } void -OptionEditor::send_mmc_toggled (CheckButton *button) +OptionEditor::mmc_device_id_adjusted () { - if (session) { - session->set_send_mmc (button->get_active()); - } -} + uint8_t id = (uint8_t) mmc_device_id_spinner.get_value(); -void -OptionEditor::mmc_control_toggled (CheckButton *button) -{ - if (session) { - session->set_mmc_control (button->get_active()); + if (id != Config->get_mmc_device_id()) { + Config->set_mmc_device_id (id); } } void -OptionEditor::midi_control_toggled (CheckButton *button) +OptionEditor::port_trace_in_toggled (MIDI::Port* port, ToggleButton* tb) { - if (session) { - session->set_midi_control (button->get_active()); + bool trace = tb->get_active(); + + if (port->input()->tracing() != trace) { + port->input()->trace (trace, &cerr, string (port->name()) + string (" input: ")); } } void -OptionEditor::midi_feedback_toggled (CheckButton *button) +OptionEditor::port_trace_out_toggled (MIDI::Port* port, ToggleButton* tb) { - if (session) { - session->set_midi_feedback (button->get_active()); + bool trace = tb->get_active(); + + if (port->output()->tracing() != trace) { + port->output()->trace (trace, &cerr, string (port->name()) + string (" output: ")); } } @@ -1264,34 +606,22 @@ gint OptionEditor::wm_close (GdkEventAny *ev) { save (); - just_close_win(); + hide (); return TRUE; } -void -OptionEditor::jack_time_master_clicked () -{ - bool yn = jack_time_master_button.get_active(); - - Config->set_jack_time_master (yn); - - if (session) { - session->engine().reset_timebase (); - } -} - void OptionEditor::raid_path_changed () { if (session) { - session->set_raid_path (session_raid_entry.get_text()); + Config->set_raid_path (session_raid_entry.get_text()); } } void OptionEditor::click_browse_clicked () { - SoundFileChooser sfdb (_("Choose Click")); + SoundFileChooser sfdb (_("Choose Click"), session); int result = sfdb.run (); @@ -1301,7 +631,7 @@ OptionEditor::click_browse_clicked () } void -OptionEditor::click_chosen (string path) +OptionEditor::click_chosen (const string & path) { click_path_entry.set_text (path); click_sound_changed (); @@ -1310,7 +640,7 @@ OptionEditor::click_chosen (string path) void OptionEditor::click_emphasis_browse_clicked () { - SoundFileChooser sfdb (_("Choose Click Emphasis")); + SoundFileChooser sfdb (_("Choose Click Emphasis"), session); int result = sfdb.run (); @@ -1320,7 +650,7 @@ OptionEditor::click_emphasis_browse_clicked () } void -OptionEditor::click_emphasis_chosen (std::string path) +OptionEditor::click_emphasis_chosen (const string & path) { click_emphasis_path_entry.set_text (path); click_emphasis_sound_changed (); @@ -1332,23 +662,16 @@ OptionEditor::click_sound_changed () if (session) { string path = click_path_entry.get_text(); - if (path == session->click_sound) { + if (path == Config->get_click_sound()) { return; } - if (path.length() == 0) { - - session->set_click_sound (""); + strip_whitespace_edges (path); + if (path == _("internal")) { + Config->set_click_sound (""); } else { - - strip_whitespace_edges (path); - - if (path == _("internal")) { - session->set_click_sound (""); - } else { - session->set_click_sound (path); - } + Config->set_click_sound (path); } } } @@ -1359,158 +682,20 @@ OptionEditor::click_emphasis_sound_changed () if (session) { string path = click_emphasis_path_entry.get_text(); - if (path == session->click_emphasis_sound) { + if (path == Config->get_click_emphasis_sound()) { return; } - if (path.length() == 0) { - - session->set_click_emphasis_sound (""); + strip_whitespace_edges (path); + if (path == _("internal")) { + Config->set_click_emphasis_sound (""); } else { - - strip_whitespace_edges (path); - - if (path == _("internal")) { - session->set_click_emphasis_sound (""); - } else { - session->set_click_emphasis_sound (path); - } + Config->set_click_emphasis_sound (path); } } } -void -OptionEditor::show_waveforms_clicked () -{ - editor.set_show_waveforms (show_waveforms_button.get_active()); -} - -void -OptionEditor::show_waveforms_recording_clicked () -{ - editor.set_show_waveforms_recording (show_waveforms_recording_button.get_active()); -} - -void -OptionEditor::show_measures_clicked () -{ - editor.set_show_measures (show_measures_button.get_active()); -} - -void -OptionEditor::follow_playhead_clicked () -{ - editor.set_follow_playhead (follow_playhead_button.get_active()); -} - -void -OptionEditor::strip_width_clicked () -{ - mixer.set_strip_width (mixer_strip_width_button.get_active() ? Narrow : Wide); -} - - -void -OptionEditor::just_close_win() -{ - hide_all(); - ARDOUR_UI::instance()->allow_focus(false); -} - -void -OptionEditor::queue_session_control_changed (Session::ControlType t) -{ - ui.call_slot (bind (mem_fun(*this, &OptionEditor::session_control_changed), t)); -} - -void -OptionEditor::session_control_changed (Session::ControlType t) -{ - switch (t) { - case Session::SlaveType: - switch (session->slave_source()) { - case Session::None: - slave_type_combo.get_entry()->set_text (positional_sync_strings[Session::None]); - break; - case Session::MTC: - slave_type_combo.get_entry()->set_text (positional_sync_strings[Session::MTC]); - break; - case Session::JACK: - slave_type_combo.get_entry()->set_text (positional_sync_strings[Session::JACK]); - break; - default: - slave_type_combo.get_entry()->set_text (_("--unknown--")); - break; - } - - break; - - case Session::SendMTC: - map_some_session_state (send_mtc_button, &Session::get_send_mtc); - break; - - case Session::SendMMC: - map_some_session_state (send_mmc_button, &Session::get_send_mmc); - break; - - case Session::MMCControl: - map_some_session_state (mmc_control_button, &Session::get_mmc_control); - break; - - case Session::MidiFeedback: - map_some_session_state (midi_feedback_button, &Session::get_midi_feedback); - break; - - case Session::MidiControl: - map_some_session_state (midi_control_button, &Session::get_midi_control); - break; - - default: - break; - } -} - -gint -OptionEditor::native_format_chosen (GdkEventAny *ignored) -{ - string which; - - if (session == 0) { - return FALSE; - } - - bool use_bwf = (native_format_combo.get_entry()->get_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 (); - } - - return TRUE; -} - -gint -OptionEditor::slave_type_chosen (GdkEventAny *ignored) -{ - string which; - - if (session == 0) { - return FALSE; - } - - which = slave_type_combo.get_entry()->get_text(); - - if (which == positional_sync_strings[Session::None]) { - session->request_slave_source (Session::None); - } else if (which == positional_sync_strings[Session::MTC]) { - session->request_slave_source (Session::MTC); - } else if (which == positional_sync_strings[Session::JACK]) { - session->request_slave_source (Session::JACK); - } - return FALSE; -} - void OptionEditor::clear_click_editor () { @@ -1536,13 +721,11 @@ OptionEditor::setup_click_editor () click_path_entry.set_name ("OptionsEntry"); click_emphasis_path_entry.set_name ("OptionsEntry"); - click_path_entry.activate.connect (mem_fun(*this, &OptionEditor::click_sound_changed)); - click_emphasis_path_entry.activate.connect (mem_fun(*this, &OptionEditor::click_emphasis_sound_changed)); + click_path_entry.signal_activate().connect (mem_fun(*this, &OptionEditor::click_sound_changed)); + click_emphasis_path_entry.signal_activate().connect (mem_fun(*this, &OptionEditor::click_emphasis_sound_changed)); - click_path_entry.signal_focus_in_event()().connect (mem_fun (Keyboard::the_keyboard(), &Keyboard::focus_in_handler)); - click_path_entry.signal_focus_out_event()().connect (bind (mem_fun(*this, &OptionEditor::focus_out_event_handler), &OptionEditor::click_sound_changed)); - click_emphasis_path_entry.signal_focus_in_event()().connect (mem_fun (Keyboard::the_keyboard(), &Keyboard::focus_in_handler)); - click_emphasis_path_entry.signal_focus_out_event()().connect (bind (mem_fun(*this, &OptionEditor::focus_out_event_handler), &OptionEditor::click_emphasis_sound_changed)); + click_path_entry.signal_focus_out_event().connect (bind (mem_fun(*this, &OptionEditor::focus_out_event_handler), &OptionEditor::click_sound_changed)); + click_emphasis_path_entry.signal_focus_out_event().connect (bind (mem_fun(*this, &OptionEditor::focus_out_event_handler), &OptionEditor::click_emphasis_sound_changed)); click_browse_button.set_name ("EditorGTKButton"); click_emphasis_browse_button.set_name ("EditorGTKButton"); @@ -1559,15 +742,15 @@ OptionEditor::setup_click_editor () label = manage(new Label(_("Click audio file"))); label->set_name ("OptionsLabel"); - click_table.attach (*label, 0, 1, 0, 1, 0, 0); - click_table.attach (click_path_entry, 1, 2, 0, 1, Gtk::FILL|Gtk::EXPAND, 0); - click_table.attach (click_browse_button, 2, 3, 0, 1, 0, 0); + click_table.attach (*label, 0, 1, 0, 1, FILL|EXPAND, FILL); + click_table.attach (click_path_entry, 1, 2, 0, 1, Gtk::FILL|Gtk::EXPAND, FILL); + click_table.attach (click_browse_button, 2, 3, 0, 1, FILL|EXPAND, FILL); label = manage(new Label(_("Click emphasis audiofile"))); label->set_name ("OptionsLabel"); - click_table.attach (*label, 0, 1, 1, 2, 0, 0); - click_table.attach (click_emphasis_path_entry, 1, 2, 1, 2, Gtk::FILL|Gtk::EXPAND, 0); - click_table.attach (click_emphasis_browse_button, 2, 3, 1, 2, 0, 0); + click_table.attach (*label, 0, 1, 1, 2, FILL|EXPAND, FILL); + click_table.attach (click_emphasis_path_entry, 1, 2, 1, 2, Gtk::FILL|Gtk::EXPAND, FILL); + click_table.attach (click_emphasis_browse_button, 2, 3, 1, 2, FILL|EXPAND, FILL); hpacker->set_spacing (10); hpacker->pack_start (*click_io_selector, false, false); @@ -1622,186 +805,13 @@ OptionEditor::connect_audition_editor () auditioner_gpm->show_all (); } -gint +bool OptionEditor::focus_out_event_handler (GdkEventFocus* ev, void (OptionEditor::*pmf)()) { (this->*pmf)(); - return Keyboard::the_keyboard().focus_out_handler (ev); -} - -void -OptionEditor::setup_misc_options() -{ - Gtk::Table* table = manage (new Table (4, 2)); - table->set_homogeneous (true); - - misc_packer.set_border_width (8); - misc_packer.set_spacing (3); - misc_packer.pack_start (*table, true, true); - - table->attach (hw_monitor_button, 0, 1, 0, 1, Gtk::FILL, 0, 8, 0); - table->attach (sw_monitor_button, 0, 1, 1, 2, Gtk::FILL, 0, 8, 0); - table->attach (plugins_stop_button, 0, 1, 2, 3, Gtk::FILL, 0, 8, 0); - table->attach (plugins_on_rec_button, 0, 1, 3, 4, Gtk::FILL, 0, 8, 0); - table->attach (verify_remove_last_capture_button, 0, 1, 4, 5, Gtk::FILL, 0, 8, 0); - - table->attach (stop_rec_on_xrun_button, 1, 2, 0, 1, Gtk::FILL, 0, 8, 0); - table->attach (stop_at_end_button, 1, 2, 1, 2, Gtk::FILL, 0, 8, 0); - table->attach (debug_keyboard_button, 1, 2, 2, 3, Gtk::FILL, 0, 8, 0); - table->attach (speed_quieten_button, 1, 2, 3, 4, Gtk::FILL, 0, 8, 0); - - Gtk::VBox* connect_box = manage (new VBox); - connect_box->set_spacing (3); - connect_box->set_border_width (8); - - auto_connect_output_manual_button.set_group (auto_connect_output_master_button.get_group()); - auto_connect_output_physical_button.set_group (auto_connect_output_master_button.get_group()); - - Gtk::HBox* useless_box = manage (new HBox); - useless_box->pack_start (auto_connect_inputs_button, false, false); - connect_box->pack_start (*useless_box, false, false); - connect_box->pack_start (auto_connect_output_master_button, false, false); - connect_box->pack_start (auto_connect_output_physical_button, false, false); - connect_box->pack_start (auto_connect_output_manual_button, false); - - misc_packer.pack_start (*connect_box, false, false); - - hw_monitor_button.set_name ("OptionEditorToggleButton"); - sw_monitor_button.set_name ("OptionEditorToggleButton"); - plugins_stop_button.set_name ("OptionEditorToggleButton"); - plugins_on_rec_button.set_name ("OptionEditorToggleButton"); - verify_remove_last_capture_button.set_name ("OptionEditorToggleButton"); - auto_connect_inputs_button.set_name ("OptionEditorToggleButton"); - auto_connect_output_physical_button.set_name ("OptionEditorToggleButton"); - auto_connect_output_master_button.set_name ("OptionEditorToggleButton"); - auto_connect_output_manual_button.set_name ("OptionEditorToggleButton"); - stop_rec_on_xrun_button.set_name ("OptionEditorToggleButton"); - stop_at_end_button.set_name ("OptionEditorToggleButton"); - debug_keyboard_button.set_name ("OptionEditorToggleButton"); - speed_quieten_button.set_name ("OptionEditorToggleButton"); - - hw_monitor_button.set_active (Config->get_use_hardware_monitoring()); - sw_monitor_button.set_active (!Config->get_no_sw_monitoring()); - plugins_stop_button.set_active (Config->get_plugins_stop_with_transport()); - stop_rec_on_xrun_button.set_active (Config->get_stop_recording_on_xrun()); - stop_at_end_button.set_active (Config->get_stop_at_session_end()); - debug_keyboard_button.set_active (false); - speed_quieten_button.set_active (Config->get_quieten_at_speed() != 1.0f); - - hw_monitor_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::hw_monitor_clicked)); - sw_monitor_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::sw_monitor_clicked)); - plugins_stop_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::plugins_stop_with_transport_clicked)); - plugins_on_rec_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::plugins_on_while_recording_clicked)); - verify_remove_last_capture_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::verify_remove_last_capture_clicked)); - auto_connect_inputs_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::auto_connect_inputs_clicked)); - auto_connect_output_physical_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::auto_connect_output_physical_clicked)); - auto_connect_output_master_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::auto_connect_output_master_clicked)); - auto_connect_output_manual_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::auto_connect_output_manual_clicked)); - stop_rec_on_xrun_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::stop_rec_on_xrun_clicked)); - stop_at_end_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::stop_at_end_clicked)); - debug_keyboard_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::debug_keyboard_clicked)); - speed_quieten_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::speed_quieten_clicked)); -} - -void -OptionEditor::speed_quieten_clicked () -{ - if (speed_quieten_button.get_active()) { - Config->set_quieten_at_speed (0.251189); // -12dB reduction for ffwd or rewind - } else { - Config->set_quieten_at_speed (1.0); /* no change */ - } -} - -void -OptionEditor::debug_keyboard_clicked () -{ - extern bool debug_keyboard; - debug_keyboard = debug_keyboard_button.get_active (); -} - -void -OptionEditor::auto_connect_inputs_clicked () -{ - if (session) { - session->set_input_auto_connect (auto_connect_inputs_button.get_active()); - } -} - -void -OptionEditor::auto_connect_output_master_clicked () -{ - if (session) { - if (auto_connect_output_master_button.get_active()) { - session->set_output_auto_connect (Session::AutoConnectMaster); - } - } -} - -void -OptionEditor::auto_connect_output_physical_clicked () -{ - if (session) { - if (auto_connect_output_physical_button.get_active()) { - session->set_output_auto_connect (Session::AutoConnectPhysical); - } - } -} - -void -OptionEditor::auto_connect_output_manual_clicked () -{ - if (session) { - if (auto_connect_output_manual_button.get_active()) { - session->set_output_auto_connect (Session::AutoConnectOption (0)); - } - } -} - -void -OptionEditor::hw_monitor_clicked () -{ - Config->set_use_hardware_monitoring (hw_monitor_button.get_active()); -} - -void -OptionEditor::sw_monitor_clicked () -{ - Config->set_no_sw_monitoring (!sw_monitor_button.get_active()); -} - -void -OptionEditor::plugins_stop_with_transport_clicked () -{ - Config->set_plugins_stop_with_transport (plugins_stop_button.get_active()); + return false; } -void -OptionEditor::plugins_on_while_recording_clicked () -{ - if (session) { - session->set_recording_plugins (plugins_on_rec_button.get_active()); - } -} - -void -OptionEditor::verify_remove_last_capture_clicked () -{ - Config->set_verify_remove_last_capture(verify_remove_last_capture_button.get_active()); -} - -void -OptionEditor::stop_rec_on_xrun_clicked () -{ - Config->set_stop_recording_on_xrun (stop_rec_on_xrun_button.get_active()); -} - -void -OptionEditor::stop_at_end_clicked () -{ - Config->set_stop_at_session_end (stop_at_end_button.get_active()); -} - static const struct { const char *name; guint modifier; @@ -1837,11 +847,11 @@ OptionEditor::setup_keyboard_options () } set_popdown_strings (edit_modifier_combo, dumb); - edit_modifier_combo.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &OptionEditor::edit_modifier_chosen)); + edit_modifier_combo.signal_changed().connect (mem_fun(*this, &OptionEditor::edit_modifier_chosen)); for (int x = 0; modifiers[x].name; ++x) { if (modifiers[x].modifier == Keyboard::edit_modifier ()) { - edit_modifier_combo.get_entry()->set_text (_(modifiers[x].name)); + edit_modifier_combo.set_active_text (_(modifiers[x].name)); break; } } @@ -1850,25 +860,25 @@ OptionEditor::setup_keyboard_options () label->set_name ("OptionsLabel"); label->set_alignment (1.0, 0.5); - keyboard_mouse_table.attach (*label, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, 0); - keyboard_mouse_table.attach (edit_modifier_combo, 1, 2, 0, 1, Gtk::FILL|Gtk::EXPAND, 0); + keyboard_mouse_table.attach (*label, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, FILL); + keyboard_mouse_table.attach (edit_modifier_combo, 1, 2, 0, 1, Gtk::FILL|Gtk::EXPAND, FILL); label = manage (new Label (_("+ button"))); label->set_name ("OptionsLabel"); - keyboard_mouse_table.attach (*label, 3, 4, 0, 1, Gtk::FILL|Gtk::EXPAND, 0); - keyboard_mouse_table.attach (edit_button_spin, 4, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, 0); + keyboard_mouse_table.attach (*label, 3, 4, 0, 1, Gtk::FILL|Gtk::EXPAND, FILL); + keyboard_mouse_table.attach (edit_button_spin, 4, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, FILL); edit_button_spin.set_name ("OptionsEntry"); edit_button_adjustment.set_value (Keyboard::edit_button()); - edit_button_adjustment.value_changed.connect (mem_fun(*this, &OptionEditor::edit_button_changed)); + edit_button_adjustment.signal_value_changed().connect (mem_fun(*this, &OptionEditor::edit_button_changed)); set_popdown_strings (delete_modifier_combo, dumb); - delete_modifier_combo.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &OptionEditor::delete_modifier_chosen)); + delete_modifier_combo.signal_changed().connect (mem_fun(*this, &OptionEditor::delete_modifier_chosen)); for (int x = 0; modifiers[x].name; ++x) { if (modifiers[x].modifier == Keyboard::delete_modifier ()) { - delete_modifier_combo.get_entry()->set_text (_(modifiers[x].name)); + delete_modifier_combo.set_active_text (_(modifiers[x].name)); break; } } @@ -1877,25 +887,25 @@ OptionEditor::setup_keyboard_options () label->set_name ("OptionsLabel"); label->set_alignment (1.0, 0.5); - keyboard_mouse_table.attach (*label, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, 0); - keyboard_mouse_table.attach (delete_modifier_combo, 1, 2, 1, 2, Gtk::FILL|Gtk::EXPAND, 0); + keyboard_mouse_table.attach (*label, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, FILL); + keyboard_mouse_table.attach (delete_modifier_combo, 1, 2, 1, 2, Gtk::FILL|Gtk::EXPAND, FILL); label = manage (new Label (_("+ button"))); label->set_name ("OptionsLabel"); - keyboard_mouse_table.attach (*label, 3, 4, 1, 2, Gtk::FILL|Gtk::EXPAND, 0); - keyboard_mouse_table.attach (delete_button_spin, 4, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, 0); + keyboard_mouse_table.attach (*label, 3, 4, 1, 2, Gtk::FILL|Gtk::EXPAND, FILL); + keyboard_mouse_table.attach (delete_button_spin, 4, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, FILL); delete_button_spin.set_name ("OptionsEntry"); delete_button_adjustment.set_value (Keyboard::delete_button()); - delete_button_adjustment.value_changed.connect (mem_fun(*this, &OptionEditor::delete_button_changed)); + delete_button_adjustment.signal_value_changed().connect (mem_fun(*this, &OptionEditor::delete_button_changed)); set_popdown_strings (snap_modifier_combo, dumb); - snap_modifier_combo.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &OptionEditor::snap_modifier_chosen)); + snap_modifier_combo.signal_changed().connect (mem_fun(*this, &OptionEditor::snap_modifier_chosen)); for (int x = 0; modifiers[x].name; ++x) { if (modifiers[x].modifier == (guint) Keyboard::snap_modifier ()) { - snap_modifier_combo.get_entry()->set_text (_(modifiers[x].name)); + snap_modifier_combo.set_active_text (_(modifiers[x].name)); break; } } @@ -1904,16 +914,16 @@ OptionEditor::setup_keyboard_options () label->set_name ("OptionsLabel"); label->set_alignment (1.0, 0.5); - keyboard_mouse_table.attach (*label, 0, 1, 2, 3, Gtk::FILL|Gtk::EXPAND, 0); - keyboard_mouse_table.attach (snap_modifier_combo, 1, 2, 2, 3, Gtk::FILL|Gtk::EXPAND, 0); + keyboard_mouse_table.attach (*label, 0, 1, 2, 3, Gtk::FILL|Gtk::EXPAND, FILL); + keyboard_mouse_table.attach (snap_modifier_combo, 1, 2, 2, 3, Gtk::FILL|Gtk::EXPAND, FILL); } -gint -OptionEditor::edit_modifier_chosen (GdkEventAny *ev) +void +OptionEditor::edit_modifier_chosen () { string txt; - txt = edit_modifier_combo.get_entry()->get_text(); + txt = edit_modifier_combo.get_active_text(); for (int i = 0; modifiers[i].name; ++i) { if (txt == _(modifiers[i].name)) { @@ -1921,15 +931,14 @@ OptionEditor::edit_modifier_chosen (GdkEventAny *ev) break; } } - return TRUE; } -gint -OptionEditor::delete_modifier_chosen (GdkEventAny *ev) +void +OptionEditor::delete_modifier_chosen () { string txt; - txt = delete_modifier_combo.get_entry()->get_text(); + txt = delete_modifier_combo.get_active_text(); for (int i = 0; modifiers[i].name; ++i) { if (txt == _(modifiers[i].name)) { @@ -1937,15 +946,14 @@ OptionEditor::delete_modifier_chosen (GdkEventAny *ev) break; } } - return TRUE; } -gint -OptionEditor::snap_modifier_chosen (GdkEventAny *ev) +void +OptionEditor::snap_modifier_chosen () { string txt; - txt = snap_modifier_combo.get_entry()->get_text(); + txt = snap_modifier_combo.get_active_text(); for (int i = 0; modifiers[i].name; ++i) { if (txt == _(modifiers[i].name)) { @@ -1953,7 +961,6 @@ OptionEditor::snap_modifier_chosen (GdkEventAny *ev) break; } } - return TRUE; } void @@ -1969,7 +976,7 @@ OptionEditor::edit_button_changed () } void -OptionEditor::fixup_combo_size (Gtk::Combo& combo, vector& strings) +OptionEditor::fixup_combo_size (Gtk::ComboBoxText& combo, vector& strings) { /* find the widest string */ @@ -1994,14 +1001,6 @@ OptionEditor::fixup_combo_size (Gtk::Combo& combo, vector& strings) const guint32 FUDGE = 10; // Combo's are stupid - they steal space from the entry for the button - set_size_request_to_display_given_text (*combo.get_entry(), maxstring.c_str(), 10 + FUDGE, 10); -} - -void -OptionEditor::map_some_session_state (CheckButton& button, bool (Session::*get)() const) -{ - if (session) { - button.set_active ((session->*get)()); - } + set_size_request_to_display_given_text (combo, maxstring.c_str(), 10 + FUDGE, 10); }