X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Frc_option_editor.cc;h=978cea87cc7116ea0240384a8cc1a9c963d68c94;hb=6a24f75a6f9cfede66441a8e3c036d116ee5c8ed;hp=c469c2da42e0f7250a04bbbc2c25edba2dba140a;hpb=38da0ec98c763a6142d45c40266a62e4c9fc0d33;p=ardour.git diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index c469c2da42..978cea87cc 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -26,6 +26,7 @@ #include #include #include +#include #include "pbd/fpu.h" #include "pbd/cpus.h" @@ -38,6 +39,8 @@ #include "ardour/control_protocol_manager.h" #include "control_protocol/control_protocol.h" +#include "ardour_window.h" +#include "ardour_dialog.h" #include "gui_thread.h" #include "midi_tracer.h" #include "rc_option_editor.h" @@ -56,29 +59,27 @@ using namespace ARDOUR; class ClickOptions : public OptionEditorBox { public: - ClickOptions (RCConfiguration* c, ArdourDialog* p) + ClickOptions (RCConfiguration* c, Gtk::Window* p) : _rc_config (c), _parent (p) { Table* t = manage (new Table (2, 3)); t->set_spacings (4); - Label* l = manage (new Label (_("Click audio file:"))); - l->set_alignment (0, 0.5); + Label* l = manage (left_aligned_label (_("Click audio file:"))); t->attach (*l, 0, 1, 0, 1, FILL); t->attach (_click_path_entry, 1, 2, 0, 1, FILL); Button* b = manage (new Button (_("Browse..."))); b->signal_clicked().connect (sigc::mem_fun (*this, &ClickOptions::click_browse_clicked)); t->attach (*b, 2, 3, 0, 1, FILL); - l = manage (new Label (_("Click emphasis audio file:"))); - l->set_alignment (0, 0.5); + l = manage (left_aligned_label (_("Click emphasis audio file:"))); t->attach (*l, 0, 1, 1, 2, FILL); t->attach (_click_emphasis_path_entry, 1, 2, 1, 2, FILL); b = manage (new Button (_("Browse..."))); b->signal_clicked().connect (sigc::mem_fun (*this, &ClickOptions::click_emphasis_browse_clicked)); t->attach (*b, 2, 3, 1, 2, FILL); - + _box->pack_start (*t, false, false); _click_path_entry.signal_activate().connect (sigc::mem_fun (*this, &ClickOptions::click_changed)); @@ -149,7 +150,7 @@ private: } RCConfiguration* _rc_config; - ArdourDialog* _parent; + Gtk::Window* _parent; Entry _click_path_entry; Entry _click_emphasis_path_entry; }; @@ -169,16 +170,14 @@ public: _limit_undo_spin.set_range (0, 512); _limit_undo_spin.set_increments (1, 10); t->attach (_limit_undo_spin, 1, 2, 0, 1, FILL | EXPAND); - Label* l = manage (new Label (_("commands"))); - l->set_alignment (0, 0.5); + Label* l = manage (left_aligned_label (_("commands"))); t->attach (*l, 2, 3, 0, 1); t->attach (_save_undo_button, 0, 1, 1, 2, FILL); _save_undo_spin.set_range (0, 512); _save_undo_spin.set_increments (1, 10); t->attach (_save_undo_spin, 1, 2, 1, 2, FILL | EXPAND); - l = manage (new Label (_("commands"))); - l->set_alignment (0, 0.5); + l = manage (left_aligned_label (_("commands"))); t->attach (*l, 2, 3, 1, 2); _box->pack_start (*t); @@ -259,7 +258,7 @@ static const struct { /* Command = Meta Option/Alt = Mod1 */ - { "Shift", GDK_SHIFT_MASK }, + { "Key|Shift", GDK_SHIFT_MASK }, { "Command", GDK_META_MASK }, { "Control", GDK_CONTROL_MASK }, { "Option", GDK_MOD1_MASK }, @@ -269,7 +268,7 @@ static const struct { { "Shift-Command-Option", GDK_MOD5_MASK|GDK_SHIFT_MASK|GDK_META_MASK }, #else - { "Shift", GDK_SHIFT_MASK }, + { "Key|Shift", GDK_SHIFT_MASK }, { "Control", GDK_CONTROL_MASK }, { "Alt (Mod1)", GDK_MOD1_MASK }, { "Control-Shift", GDK_CONTROL_MASK|GDK_SHIFT_MASK }, @@ -300,7 +299,7 @@ public: vector dumb; for (int i = 0; modifiers[i].name; ++i) { - dumb.push_back (_(modifiers[i].name)); + dumb.push_back (S_(modifiers[i].name)); } set_popdown_strings (_edit_modifier_combo, dumb); @@ -308,7 +307,7 @@ public: for (int x = 0; modifiers[x].name; ++x) { if (modifiers[x].modifier == Keyboard::edit_modifier ()) { - _edit_modifier_combo.set_active_text (_(modifiers[x].name)); + _edit_modifier_combo.set_active_text (S_(modifiers[x].name)); break; } } @@ -316,9 +315,8 @@ public: Table* t = manage (new Table (4, 4)); t->set_spacings (4); - Label* l = manage (new Label (_("Edit using:"))); + Label* l = manage (left_aligned_label (_("Edit using:"))); l->set_name ("OptionsLabel"); - l->set_alignment (0, 0.5); t->attach (*l, 0, 1, 0, 1, FILL | EXPAND, FILL); t->attach (_edit_modifier_combo, 1, 2, 0, 1, FILL | EXPAND, FILL); @@ -338,14 +336,13 @@ public: for (int x = 0; modifiers[x].name; ++x) { if (modifiers[x].modifier == Keyboard::delete_modifier ()) { - _delete_modifier_combo.set_active_text (_(modifiers[x].name)); + _delete_modifier_combo.set_active_text (S_(modifiers[x].name)); break; } } - l = manage (new Label (_("Delete using:"))); + l = manage (left_aligned_label (_("Delete using:"))); l->set_name ("OptionsLabel"); - l->set_alignment (0, 0.5); t->attach (*l, 0, 1, 1, 2, FILL | EXPAND, FILL); t->attach (_delete_modifier_combo, 1, 2, 1, 2, FILL | EXPAND, FILL); @@ -366,14 +363,13 @@ public: for (int x = 0; modifiers[x].name; ++x) { if (modifiers[x].modifier == Keyboard::insert_note_modifier ()) { - _insert_note_modifier_combo.set_active_text (_(modifiers[x].name)); + _insert_note_modifier_combo.set_active_text (S_(modifiers[x].name)); break; } } - l = manage (new Label (_("Insert note using:"))); + l = manage (left_aligned_label (_("Insert note using:"))); l->set_name ("OptionsLabel"); - l->set_alignment (0, 0.5); t->attach (*l, 0, 1, 2, 3, FILL | EXPAND, FILL); t->attach (_insert_note_modifier_combo, 1, 2, 2, 3, FILL | EXPAND, FILL); @@ -394,14 +390,13 @@ public: for (int x = 0; modifiers[x].name; ++x) { if (modifiers[x].modifier == (guint) Keyboard::snap_modifier ()) { - _snap_modifier_combo.set_active_text (_(modifiers[x].name)); + _snap_modifier_combo.set_active_text (S_(modifiers[x].name)); break; } } - l = manage (new Label (_("Toggle snap using:"))); + l = manage (left_aligned_label (_("Toggle snap using:"))); l->set_name ("OptionsLabel"); - l->set_alignment (0, 0.5); t->attach (*l, 0, 1, 3, 4, FILL | EXPAND, FILL); t->attach (_snap_modifier_combo, 1, 2, 3, 4, FILL | EXPAND, FILL); @@ -416,9 +411,8 @@ public: _keyboard_layout_selector.set_active_text (Keyboard::current_binding_name()); _keyboard_layout_selector.signal_changed().connect (sigc::mem_fun (*this, &KeyboardOptions::bindings_changed)); - l = manage (new Label (_("Keyboard layout:"))); + l = manage (left_aligned_label (_("Keyboard layout:"))); l->set_name ("OptionsLabel"); - l->set_alignment (0, 0.5); t->attach (*l, 0, 1, 4, 5, FILL | EXPAND, FILL); t->attach (_keyboard_layout_selector, 1, 2, 4, 5, FILL | EXPAND, FILL); @@ -657,7 +651,7 @@ private: class ControlSurfacesOptions : public OptionEditorBox { public: - ControlSurfacesOptions (ArdourDialog& parent) + ControlSurfacesOptions (Gtk::Window& parent) : _parent (parent) { _store = ListStore::create (_model); @@ -676,7 +670,11 @@ public: _box->pack_start (*label, false, false); label->show (); - _store->signal_row_changed().connect (sigc::mem_fun (*this, &ControlSurfacesOptions::model_changed)); + ControlProtocolManager& m = ControlProtocolManager::instance (); + m.ProtocolStatusChange.connect (protocol_status_connection, MISSING_INVALIDATOR, + boost::bind (&ControlSurfacesOptions::protocol_status_changed, this, _1), gui_context()); + + _store->signal_row_changed().connect (sigc::mem_fun (*this, &ControlSurfacesOptions::view_changed)); _view.signal_button_press_event().connect_notify (sigc::mem_fun(*this, &ControlSurfacesOptions::edit_clicked)); } @@ -704,7 +702,18 @@ public: private: - void model_changed (TreeModel::Path const &, TreeModel::iterator const & i) + void protocol_status_changed (ControlProtocolInfo* cpi) { + /* find the row */ + TreeModel::Children rows = _store->children(); + for (TreeModel::Children::iterator x = rows.begin(); x != rows.end(); ++x) { + if ((*x)[_model.protocol_info] == cpi) { + (*x)[_model.enabled] = (cpi->protocol || cpi->requested); + break; + } + } + } + + void view_changed (TreeModel::Path const &, TreeModel::iterator const & i) { TreeModel::Row r = *i; @@ -720,7 +729,18 @@ private: if (!was_enabled) { ControlProtocolManager::instance().instantiate (*cpi); } else { + Gtk::Window* win = r[_model.editor]; + if (win) { + win->hide (); + } + ControlProtocolManager::instance().teardown (*cpi); + + if (win) { + delete win; + } + r[_model.editor] = 0; + cpi->requested = false; } } @@ -754,8 +774,9 @@ private: Box* box = (Box*) cpi->protocol->get_gui (); if (box) { string title = row[_model.name]; - ArdourDialog* win = new ArdourDialog (_parent, title); - win->get_vbox()->pack_start (*box, false, false); + ArdourWindow* win = new ArdourWindow (_parent, title); + win->set_title ("Control Protocol Options"); + win->add (*box); box->show (); win->present (); row[_model.editor] = win; @@ -788,6 +809,7 @@ private: ControlSurfacesModelColumns _model; TreeView _view; Gtk::Window& _parent; + PBD::ScopedConnection protocol_status_connection; }; /** A class which allows control of visibility of some editor components usign @@ -832,6 +854,8 @@ public: add_widget_to_page (p, _visibility_group->list_view ()); } + Gtk::Widget& tip_widget() { return *_visibility_group->list_view (); } + private: void changed () { @@ -875,53 +899,15 @@ RCOptionEditor::RCOptionEditor () procs->add (i, string_compose (_("%1 processors"), i)); } + procs->set_note (string_compose (_("This setting will only take effect when %1 is restarted."), PROGRAM_NAME)); + add_option (_("Misc"), procs); } - add_option (_("Misc"), new OptionEditorHeading (_("Metering"))); - - ComboOption* mht = new ComboOption ( - "meter-hold", - _("Meter hold time"), - sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_hold), - sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_hold) - ); - - mht->add (MeterHoldOff, _("off")); - mht->add (MeterHoldShort, _("short")); - mht->add (MeterHoldMedium, _("medium")); - mht->add (MeterHoldLong, _("long")); - - add_option (_("Misc"), mht); - - ComboOption* mfo = new ComboOption ( - "meter-falloff", - _("Meter fall-off"), - sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_falloff), - sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_falloff) - ); - - mfo->add (METER_FALLOFF_OFF, _("off")); - mfo->add (METER_FALLOFF_SLOWEST, _("slowest")); - mfo->add (METER_FALLOFF_SLOW, _("slow")); - mfo->add (METER_FALLOFF_MEDIUM, _("medium")); - mfo->add (METER_FALLOFF_FAST, _("fast")); - mfo->add (METER_FALLOFF_FASTER, _("faster")); - mfo->add (METER_FALLOFF_FASTEST, _("fastest")); - - add_option (_("Misc"), mfo); - - add_option (_("Misc"), new OptionEditorHeading (_("Undo"))); + add_option (_("Misc"), new OptionEditorHeading (S_("Options|Undo"))); add_option (_("Misc"), new UndoOptions (_rc_config)); - add_option (_("Misc"), new OptionEditorHeading (_("Misc"))); - -#ifndef GTKOSX - /* font scaling does nothing with GDK/Quartz */ - add_option (_("Misc"), new FontScalingOptions (_rc_config)); -#endif - add_option (_("Misc"), new BoolOption ( "verify-remove-last-capture", @@ -938,13 +924,7 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (*_rc_config, &RCConfiguration::set_periodic_safety_backups) )); - add_option (_("Misc"), - new BoolOption ( - "sync-all-route-ordering", - _("Synchronise editor and mixer track order"), - sigc::mem_fun (*_rc_config, &RCConfiguration::get_sync_all_route_ordering), - sigc::mem_fun (*_rc_config, &RCConfiguration::set_sync_all_route_ordering) - )); + add_option (_("Misc"), new OptionEditorHeading (_("Session Management"))); add_option (_("Misc"), new BoolOption ( @@ -954,99 +934,228 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (*_rc_config, &RCConfiguration::set_only_copy_imported_files) )); - add_option (_("Misc"), - new BoolOption ( - "default-narrow_ms", - _("Use narrow mixer strips"), - sigc::mem_fun (*_rc_config, &RCConfiguration::get_default_narrow_ms), - sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_narrow_ms) - )); + add_option (_("Misc"), new DirectoryOption ( + X_("default-session-parent-dir"), + _("Default folder for new sessions:"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_default_session_parent_dir), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_session_parent_dir) + )); add_option (_("Misc"), - new BoolOption ( - "name-new-markers", - _("Name new markers"), - sigc::mem_fun (*_rc_config, &RCConfiguration::get_name_new_markers), - sigc::mem_fun (*_rc_config, &RCConfiguration::set_name_new_markers) + new SpinOption ( + "max-recent-sessions", + _("Maximum number of recent sessions"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_max_recent_sessions), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_max_recent_sessions), + 0, 1000, 1, 20 )); add_option (_("Misc"), new OptionEditorHeading (_("Click"))); add_option (_("Misc"), new ClickOptions (_rc_config, this)); + add_option (_("Misc"), + new FaderOption ( + "click-gain", + _("Click gain level"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_click_gain), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_click_gain) + )); + + add_option (_("Misc"), new OptionEditorHeading (_("Automation"))); + + add_option (_("Misc"), + new SpinOption ( + "automation-thinning-factor", + _("Thinning factor (larger value => less data)"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_automation_thinning_factor), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_automation_thinning_factor), + 0, 1000, 1, 20 + )); + /* TRANSPORT */ - add_option (_("Transport"), - new BoolOption ( + BoolOption* tsf; + + tsf = new BoolOption ( "latched-record-enable", _("Keep record-enable engaged on stop"), sigc::mem_fun (*_rc_config, &RCConfiguration::get_latched_record_enable), sigc::mem_fun (*_rc_config, &RCConfiguration::set_latched_record_enable) - )); + ); + // Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), _("")); + add_option (_("Transport"), tsf); - add_option (_("Transport"), - new BoolOption ( + tsf = new BoolOption ( "stop-recording-on-xrun", _("Stop recording when an xrun occurs"), sigc::mem_fun (*_rc_config, &RCConfiguration::get_stop_recording_on_xrun), sigc::mem_fun (*_rc_config, &RCConfiguration::set_stop_recording_on_xrun) - )); + ); + Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), _("When enabled Ardour will stop recording if an over- or underrun is detected by the audio engine")); + add_option (_("Transport"), tsf); - add_option (_("Transport"), - new BoolOption ( + tsf = new BoolOption ( "create-xrun-marker", _("Create markers where xruns occur"), sigc::mem_fun (*_rc_config, &RCConfiguration::get_create_xrun_marker), sigc::mem_fun (*_rc_config, &RCConfiguration::set_create_xrun_marker) - )); + ); + // Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), _("")); + add_option (_("Transport"), tsf); - add_option (_("Transport"), - new BoolOption ( + tsf = new BoolOption ( "stop-at-session-end", _("Stop at the end of the session"), sigc::mem_fun (*_rc_config, &RCConfiguration::get_stop_at_session_end), sigc::mem_fun (*_rc_config, &RCConfiguration::set_stop_at_session_end) - )); + ); + Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), _("When enabled if Ardour is not recording, it will stop the transport " + "when it reaches the current session end marker\n\n" + "When disabled Ardour will continue to roll past the session end marker at all times")); + add_option (_("Transport"), tsf); - add_option (_("Transport"), - new BoolOption ( + tsf = new BoolOption ( "seamless-loop", _("Do seamless looping (not possible when slaved to MTC, JACK etc)"), sigc::mem_fun (*_rc_config, &RCConfiguration::get_seamless_loop), sigc::mem_fun (*_rc_config, &RCConfiguration::set_seamless_loop) - )); - - add_option (_("Transport"), - new BoolOption ( - "primary-clock-delta-edit-cursor", - _("Primary clock delta to edit cursor"), - sigc::mem_fun (*_rc_config, &RCConfiguration::get_primary_clock_delta_edit_cursor), - sigc::mem_fun (*_rc_config, &RCConfiguration::set_primary_clock_delta_edit_cursor) - )); - - add_option (_("Transport"), - new BoolOption ( - "secondary-clock-delta-edit-cursor", - _("Secondary clock delta to edit cursor"), - sigc::mem_fun (*_rc_config, &RCConfiguration::get_secondary_clock_delta_edit_cursor), - sigc::mem_fun (*_rc_config, &RCConfiguration::set_secondary_clock_delta_edit_cursor) - )); - - add_option (_("Transport"), - new BoolOption ( + ); + Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), _("When enabled this will loop by reading ahead and wrapping around at the loop point, " + "preventing any need to do a transport locate at the end of the loop\n\n" + "When disabled looping is done by locating back to the start of the loop when Ardour reaches the end " + "which will often cause a small click or delay")); + add_option (_("Transport"), tsf); + + tsf = new BoolOption ( "disable-disarm-during-roll", _("Disable per-track record disarm while rolling"), sigc::mem_fun (*_rc_config, &RCConfiguration::get_disable_disarm_during_roll), sigc::mem_fun (*_rc_config, &RCConfiguration::set_disable_disarm_during_roll) - )); + ); + Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), _("When enabled this will prevent you from accidentally stopping specific tracks recording during a take")); + add_option (_("Transport"), tsf); - add_option (_("Transport"), - new BoolOption ( + tsf = new BoolOption ( "quieten_at_speed", _("12dB gain reduction during fast-forward and fast-rewind"), sigc::mem_fun (*_rc_config, &RCConfiguration::get_quieten_at_speed), sigc::mem_fun (*_rc_config, &RCConfiguration::set_quieten_at_speed) - )); + ); + Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), _("This will reduce the unpleasant increase in perceived volume " + "that occurs when fast-forwarding or rewinding through some kinds of audio")); + add_option (_("Transport"), tsf); + + add_option (_("Transport"), new OptionEditorHeading (S_("Sync/Slave"))); + + _sync_source = new ComboOption ( + "sync-source", + _("External timecode source"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_sync_source), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_sync_source) + ); + + populate_sync_options (); + add_option (_("Transport"), _sync_source); + + _sync_framerate = new BoolOption ( + "timecode-sync-frame-rate", + _("Match session video frame rate to external timecode"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_timecode_sync_frame_rate), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_timecode_sync_frame_rate) + ); + Gtkmm2ext::UI::instance()->set_tip + (_sync_framerate->tip_widget(), + _("This option controls the value of the video frame rate while chasing an external timecode source.\n\n" + "When enabled the session video frame rate will be changed to match that of the selected external timecode source.\n\n" + "When disabled the session video frame rate will not be changed to match that of the selected external timecode source." + "Instead the frame rate indication in the main clock will flash red and Ardour will convert between the external " + "timecode standard and the session standard.")); + + add_option (_("Transport"), _sync_framerate); + + _sync_genlock = new BoolOption ( + "timecode-source-is-synced", + _("External timecode is sync locked"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_timecode_source_is_synced), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_timecode_source_is_synced) + ); + Gtkmm2ext::UI::instance()->set_tip + (_sync_genlock->tip_widget(), + _("When enabled indicates that the selected external timecode source shares sync (Black & Burst, Wordclock, etc) with the audio interface.")); + + + add_option (_("Transport"), _sync_genlock); + + _sync_source_2997 = new BoolOption ( + "timecode-source-2997", + _("Lock to 29.9700 fps instead of 30000/1001"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_timecode_source_2997), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_timecode_source_2997) + ); + Gtkmm2ext::UI::instance()->set_tip + (_sync_source_2997->tip_widget(), + _("When enabled the external timecode source is assumed to use 29.97 fps instead of 30000/1001.\n" + "SMPTE 12M-1999 specifies 29.97df as 30000/1001. The spec further mentions that " + "drop-frame timecode has an accumulated error of -86ms over a 24-hour period.\n" + "Drop-frame timecode would compensate exactly for a NTSC color frame rate of 30 * 0.9990 (ie 29.970000). " + "That is not the actual rate, however some vendor use that rate - despite it being against the specs - " + "because the variant of using exactly 29.97 fps has zero timecode drift.\n" + )); + + add_option (_("Transport"), _sync_source_2997); + + _ltc_port = new ComboStringOption ( + "ltc-source-port", + _("LTC incoming port"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_ltc_source_port), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_ltc_source_port) + ); + + vector physical_inputs; + physical_inputs.push_back (_("None")); + AudioEngine::instance()->get_physical_inputs (DataType::AUDIO, physical_inputs); + _ltc_port->set_popdown_strings (physical_inputs); + + add_option (_("Transport"), _ltc_port); + +#ifdef HAVE_LTC + // TODO; rather disable this button than not compile it.. + add_option (_("Transport"), new OptionEditorHeading (S_("LTC Generator"))); + + add_option (_("Transport"), + new BoolOption ( + "send-ltc", + _("Enable LTC generator"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_send_ltc), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_send_ltc) + )); + + _ltc_send_continuously = new BoolOption ( + "ltc-send-continuously", + _("send LTC while stopped"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_ltc_send_continuously), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_ltc_send_continuously) + ); + Gtkmm2ext::UI::instance()->set_tip + (_ltc_send_continuously->tip_widget(), + _("When enabled Ardour will continue to send LTC information even when the transport (playhead) is not moving")); + add_option (_("Transport"), _ltc_send_continuously); + + _ltc_volume_adjustment = new Gtk::Adjustment(-18, -50, 0, .5, 5); + _ltc_volume_adjustment->set_value (20 * log10(_rc_config->get_ltc_output_volume())); + _ltc_volume_adjustment->signal_value_changed().connect (sigc::mem_fun (*this, &RCOptionEditor::ltc_generator_volume_changed)); + _ltc_volume_slider = new HSliderOption("ltcvol", ("LTC generator level:"), *_ltc_volume_adjustment); + + Gtkmm2ext::UI::instance()->set_tip + (_ltc_volume_slider->tip_widget(), + _("Specify the Peak Volume of the generated LTC signal in dbFS. A good value is 0dBu ^= -18dbFS in an EBU calibrated system")); + + add_option (_("Transport"), _ltc_volume_slider); + parameter_changed ("send-ltc"); +#endif + + parameter_changed ("sync-source"); /* EDITOR */ @@ -1098,6 +1207,16 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_waveforms) )); + add_option (_("Editor"), + new BoolComboOption ( + "show-region-gain-envelopes", + _("Show gain envelopes in audio regions"), + _("in all modes"), + _("only in region gain mode"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_show_region_gain), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_region_gain) + )); + ComboOption* wfs = new ComboOption ( "waveform-scale", _("Waveform scale"), @@ -1146,6 +1265,46 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (*_rc_config, &RCConfiguration::set_color_regions_using_track_color) )); + add_option (_("Editor"), + new BoolOption ( + "update-editor-during-summary-drag", + _("Update editor window during drags of the summary"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_update_editor_during_summary_drag), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_update_editor_during_summary_drag) + )); + + add_option (_("Editor"), + new BoolOption ( + "sync-all-route-ordering", + _("Synchronise editor and mixer track order"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_sync_all_route_ordering), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_sync_all_route_ordering) + )); + + add_option (_("Editor"), + new BoolOption ( + "link-editor-and-mixer-selection", + _("Synchronise editor and mixer selection"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_link_editor_and_mixer_selection), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_link_editor_and_mixer_selection) + )); + + add_option (_("Editor"), + new BoolOption ( + "name-new-markers", + _("Name new markers"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_name_new_markers), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_name_new_markers) + )); + + add_option (_("Editor"), + new BoolOption ( + "autoscroll-editor", + _("Auto-scroll editor window when dragging near its edges"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_autoscroll_editor), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_autoscroll_editor) + )); + /* AUDIO */ add_option (_("Audio"), new OptionEditorHeading (_("Buffering"))); @@ -1169,8 +1328,6 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (*_rc_config, &RCConfiguration::set_monitoring_model) ); - add_option (_("Audio"), mm); - #ifndef __APPLE__ /* no JACK monitoring on CoreAudio */ if (AudioEngine::instance()->can_request_hardware_monitoring()) { @@ -1180,6 +1337,8 @@ RCOptionEditor::RCOptionEditor () mm->add (SoftwareMonitoring, _("ardour")); mm->add (ExternalMonitoring, _("audio hardware")); + add_option (_("Audio"), mm); + add_option (_("Audio"), new BoolOption ( "tape-machine-mode", @@ -1253,7 +1412,7 @@ RCOptionEditor::RCOptionEditor () } if (fpu.has_flush_to_zero() && fpu.has_denormals_are_zero()) { - dm->add (DenormalFTZDAZ, _("use FlushToZero and DenormalsAreZerO")); + dm->add (DenormalFTZDAZ, _("use FlushToZero and DenormalsAreZero")); } add_option (_("Audio"), dm); @@ -1263,7 +1422,7 @@ RCOptionEditor::RCOptionEditor () add_option (_("Audio"), new BoolOption ( "plugins-stop-with-transport", - _("Stop plugins when the transport is stopped"), + _("Silence plugins when the transport is stopped"), sigc::mem_fun (*_rc_config, &RCConfiguration::get_plugins_stop_with_transport), sigc::mem_fun (*_rc_config, &RCConfiguration::set_plugins_stop_with_transport) )); @@ -1499,9 +1658,31 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (*_rc_config, &RCConfiguration::set_first_midi_bank_is_zero) )); - /* CONTROL SURFACES */ + add_option (_("MIDI"), + new BoolOption ( + "never-display-periodic-midi", + _("Never display periodic MIDI messages (MTC, MIDI Clock)"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_never_display_periodic_midi), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_never_display_periodic_midi) + )); + + add_option (_("MIDI"), + new BoolOption ( + "sound-midi-notes", + _("Sound MIDI notes as they are selected"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_sound_midi_notes), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_sound_midi_notes) + )); + + /* USER INTERACTION */ + + add_option (_("User interaction"), new OptionEditorHeading (_("Keyboard"))); + + add_option (_("User interaction"), new KeyboardOptions); + + add_option (_("User interaction"), new OptionEditorHeading (_("Control surfaces"))); - add_option (_("Control surfaces"), new ControlSurfacesOptions (*this)); + add_option (_("User interaction"), new ControlSurfacesOptions (*this)); ComboOption* rm = new ComboOption ( "remote-model", @@ -1514,13 +1695,29 @@ RCOptionEditor::RCOptionEditor () rm->add (MixerOrdered, _("follows order of mixer")); rm->add (EditorOrdered, _("follows order of editor")); - add_option (_("Control surfaces"), rm); + add_option (_("User interaction"), rm); - /* KEYBOARD */ + /* INTERFACE */ - add_option (_("Keyboard"), new KeyboardOptions); + add_option (S_("GUI"), + new BoolOption ( + "widget-prelight", + _("Graphically indicate mouse pointer hovering over various widgets"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_widget_prelight), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_widget_prelight) + )); - /* INTERFACE */ +#ifndef GTKOSX + /* font scaling does nothing with GDK/Quartz */ + add_option (S_("GUI"), new FontScalingOptions (_rc_config)); +#endif + add_option (S_("GUI"), + new BoolOption ( + "use-own-plugin-gui", + _("Use plugins' own interfaces instead of Ardour's"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_plugin_own_gui), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_plugin_own_gui) + )); /* The names of these controls must be the same as those given in MixerStrip for the actual widgets being controlled. @@ -1528,9 +1725,12 @@ RCOptionEditor::RCOptionEditor () _mixer_strip_visibility.add (0, X_("PhaseInvert"), _("Phase Invert")); _mixer_strip_visibility.add (0, X_("SoloSafe"), _("Solo Safe")); _mixer_strip_visibility.add (0, X_("SoloIsolated"), _("Solo Isolated")); + _mixer_strip_visibility.add (0, X_("Comments"), _("Comments")); + _mixer_strip_visibility.add (0, X_("Group"), _("Group")); + _mixer_strip_visibility.add (0, X_("MeterPoint"), _("Meter Point")); add_option ( - _("Interface"), + S_("GUI"), new VisibilityOption ( _("Mixer Strip"), &_mixer_strip_visibility, @@ -1538,6 +1738,47 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (*_rc_config, &RCConfiguration::set_mixer_strip_visibility) ) ); + + add_option (S_("GUI"), + new BoolOption ( + "default-narrow_ms", + _("Use narrow strips in the mixer by default"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_default_narrow_ms), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_narrow_ms) + )); + + add_option (S_("GUI"), new OptionEditorHeading (_("Metering"))); + + ComboOption* mht = new ComboOption ( + "meter-hold", + _("Meter hold time"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_hold), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_hold) + ); + + mht->add (MeterHoldOff, _("off")); + mht->add (MeterHoldShort, _("short")); + mht->add (MeterHoldMedium, _("medium")); + mht->add (MeterHoldLong, _("long")); + + add_option (S_("GUI"), mht); + + ComboOption* mfo = new ComboOption ( + "meter-falloff", + _("Meter fall-off"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_falloff), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_falloff) + ); + + mfo->add (METER_FALLOFF_OFF, _("off")); + mfo->add (METER_FALLOFF_SLOWEST, _("slowest")); + mfo->add (METER_FALLOFF_SLOW, _("slow")); + mfo->add (METER_FALLOFF_MEDIUM, _("medium")); + mfo->add (METER_FALLOFF_FAST, _("fast")); + mfo->add (METER_FALLOFF_FASTER, _("faster")); + mfo->add (METER_FALLOFF_FASTEST, _("fastest")); + + add_option (S_("GUI"), mfo); } void @@ -1553,5 +1794,45 @@ RCOptionEditor::parameter_changed (string const & p) } _solo_control_is_listen_control->set_sensitive (s); _listen_position->set_sensitive (s); + } else if (p == "sync-source") { + _sync_source->set_sensitive (true); + if (_session) { + _sync_source->set_sensitive (_session->config.get_external_sync()); + } + switch(Config->get_sync_source()) { + case ARDOUR::MTC: + case ARDOUR::LTC: + _sync_genlock->set_sensitive (true); + _sync_framerate->set_sensitive (true); + _sync_source_2997->set_sensitive (true); + break; + default: + _sync_genlock->set_sensitive (false); + _sync_framerate->set_sensitive (false); + _sync_source_2997->set_sensitive (false); + break; + } +#ifdef HAVE_LTC + } else if (p == "send-ltc") { + bool const s = Config->get_send_ltc (); + _ltc_send_continuously->set_sensitive (s); + _ltc_volume_slider->set_sensitive (s); +#endif /*HAVE_LTC*/ + } +} + +void RCOptionEditor::ltc_generator_volume_changed () { + _rc_config->set_ltc_output_volume (pow(10, _ltc_volume_adjustment->get_value() / 20)); +} + +void +RCOptionEditor::populate_sync_options () +{ + vector sync_opts = ARDOUR::get_available_sync_options (); + + _sync_source->clear (); + + for (vector::iterator i = sync_opts.begin(); i != sync_opts.end(); ++i) { + _sync_source->add (*i, sync_source_to_string (*i)); } }