#include <gtkmm/stock.h>
#include <gtkmm/scale.h>
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/slider_controller.h>
-#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/paths_dialog.h>
-#include <gtkmm2ext/window_title.h>
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/window_title.h"
#include "pbd/fpu.h"
#include "pbd/cpus.h"
#include "ardour/audio_backend.h"
#include "ardour/audioengine.h"
-#include "ardour/profile.h"
-#include "ardour/dB.h"
-#include "ardour/rc_configuration.h"
#include "ardour/control_protocol_manager.h"
+#include "ardour/dB.h"
#include "ardour/port_manager.h"
#include "ardour/plugin_manager.h"
+#include "ardour/profile.h"
+#include "ardour/rc_configuration.h"
+#include "ardour/transport_master_manager.h"
+
#include "control_protocol/control_protocol.h"
-#include "canvas/wave_view.h"
+#include "waveview/wave_view.h"
+
+#include "widgets/paths_dialog.h"
+#include "widgets/tooltips.h"
#include "ardour_dialog.h"
#include "ardour_ui.h"
#include "midi_tracer.h"
#include "rc_option_editor.h"
#include "sfdb_ui.h"
-#include "tooltips.h"
+#include "transport_masters_dialog.h"
#include "ui_config.h"
#include "utils.h"
using namespace PBD;
using namespace ARDOUR;
using namespace ARDOUR_UI_UTILS;
+using namespace ArdourWidgets;
class ClickOptions : public OptionEditorMiniPage
{
{
// TODO get rid of GTK -> use OptionEditor Widgets
Table* t = &table;
+ Label* l;
+ int row = 0;
- Label* l = manage (left_aligned_label (_("Emphasis on first beat")));
+ l = manage (left_aligned_label (_("Emphasis on first beat")));
_use_emphasis_on_click_check_button.add (*l);
- t->attach (_use_emphasis_on_click_check_button, 1, 3, 0, 1, FILL);
+ t->attach (_use_emphasis_on_click_check_button, 1, 3, row, row + 1, FILL);
_use_emphasis_on_click_check_button.signal_toggled().connect (
sigc::mem_fun (*this, &ClickOptions::use_emphasis_on_click_toggled));
+ ++row;
l = manage (left_aligned_label (_("Use built-in default sounds")));
_use_default_click_check_button.add (*l);
- t->attach (_use_default_click_check_button, 1, 3, 1, 2, FILL);
+ t->attach (_use_default_click_check_button, 1, 3, row, row + 1, FILL);
_use_default_click_check_button.signal_toggled().connect (
sigc::mem_fun (*this, &ClickOptions::use_default_click_toggled));
+ ++row;
l = manage (left_aligned_label (_("Audio file:")));
- t->attach (*l, 1, 2, 2, 3, FILL);
- t->attach (_click_path_entry, 2, 3, 2, 3, FILL);
+ t->attach (*l, 1, 2, row, row + 1, FILL);
+ t->attach (_click_path_entry, 2, 3, row, row + 1, FILL);
_click_browse_button.signal_clicked ().connect (
sigc::mem_fun (*this, &ClickOptions::click_browse_clicked));
- t->attach (_click_browse_button, 3, 4, 2, 3, FILL);
+ t->attach (_click_browse_button, 3, 4, row, row + 1, FILL);
+ ++row;
l = manage (left_aligned_label (_("Emphasis audio file:")));
- t->attach (*l, 1, 2, 3, 4, FILL);
- t->attach (_click_emphasis_path_entry, 2, 3, 3, 4, FILL);
+ t->attach (*l, 1, 2, row, row + 1, FILL);
+ t->attach (_click_emphasis_path_entry, 2, 3, row, row + 1, FILL);
_click_emphasis_browse_button.signal_clicked ().connect (
sigc::mem_fun (*this, &ClickOptions::click_emphasis_browse_clicked));
- t->attach (_click_emphasis_browse_button, 3, 4, 3, 4, FILL);
+ t->attach (_click_emphasis_browse_button, 3, 4, row, row + 1, FILL);
+ ++row;
_click_fader = new FaderOption (
"click-gain",
if (_rc_config->get_click_sound ().empty() &&
_rc_config->get_click_emphasis_sound().empty()) {
_use_default_click_check_button.set_active (true);
- _use_emphasis_on_click_check_button.set_active (true);
+ _use_emphasis_on_click_check_button.set_active (_rc_config->get_use_click_emphasis ());
} else {
_use_default_click_check_button.set_active (false);
{
UIConfiguration::instance().set_waveform_clip_level (_clip_level_adjustment.get_value());
/* XXX: should be triggered from the parameter changed signal */
- ArdourCanvas::WaveView::set_clip_level (_clip_level_adjustment.get_value());
+ ArdourWaveView::WaveView::set_clip_level (_clip_level_adjustment.get_value());
}
Adjustment _clip_level_adjustment;
if (!(*i)->mandatory) {
TreeModel::Row r = *_store->append ();
r[_model.name] = (*i)->name;
- r[_model.enabled] = ((*i)->protocol || (*i)->requested);
+ r[_model.enabled] = 0 != (*i)->protocol;
r[_model.protocol_info] = *i;
}
}
if ((*x)[_model.protocol_info] == cpi) {
_ignore_view_change++;
- (*x)[_model.enabled] = (cpi->protocol || cpi->requested);
+ (*x)[_model.enabled] = 0 != cpi->protocol;
_ignore_view_change--;
+ selection_changed (); // update sensitivity
break;
}
}
{
//enable the Edit button when a row is selected for editing
TreeModel::Row row = *(_view.get_selection()->get_selected());
- if (row && row[_model.enabled])
- edit_button->set_sensitive (true);
- else
+ if (row && row[_model.enabled]) {
+ ControlProtocolInfo* cpi = row[_model.protocol_info];
+ edit_button->set_sensitive (cpi && cpi->protocol && cpi->protocol->has_editor ());
+ } else {
edit_button->set_sensitive (false);
+ }
}
void view_changed (TreeModel::Path const &, TreeModel::iterator const & i)
t->attach (_video_advanced_setup_button, 1, 4, n, n + 1, FILL);
_video_advanced_setup_button.signal_toggled().connect (sigc::mem_fun (*this, &VideoTimelineOptions::video_advanced_setup_toggled));
Gtkmm2ext::UI::instance()->set_tip (_video_advanced_setup_button,
- _("<b>When enabled</b> you can speficify a custom video-server URL and docroot. - Do not enable this option unless you know what you are doing."));
+ _("<b>When enabled</b> you can specify a custom video-server URL and docroot. - Do not enable this option unless you know what you are doing."));
++n;
Label* l = manage (new Label (_("Video Server URL:")));
t->attach (*l, 1, 2, n, n + 1, FILL);
t->attach (_video_server_docroot_entry, 2, 4, n, n + 1);
Gtkmm2ext::UI::instance()->set_tip (_video_server_docroot_entry,
- _("Local path to the video-server document-root. Only files below this directory will be accessible by the video-server. If the server run on a remote host, it should point to a network mounted folder of the server's docroot or be left empty if it is unvailable. It is used for the local video-monitor and file-browsing when opening/adding a video file."));
+ _("Local path to the video-server document-root. Only files below this directory will be accessible by the video-server. If the server run on a remote host, it should point to a network mounted folder of the server's docroot or be left empty if it is unavailable. It is used for the local video-monitor and file-browsing when opening/adding a video file."));
++n;
l = manage (new Label (""));
_video_server_docroot_entry.signal_activate().connect (sigc::mem_fun(*this, &VideoTimelineOptions::server_docroot_changed));
_custom_xjadeo_path.signal_changed().connect (sigc::mem_fun (*this, &VideoTimelineOptions::custom_xjadeo_path_changed));
_xjadeo_browse_button.signal_clicked ().connect (sigc::mem_fun (*this, &VideoTimelineOptions::xjadeo_browse_clicked));
-
- // xjadeo-path is a UIConfig parameter
- UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &VideoTimelineOptions::parameter_changed));
}
void server_url_changed ()
void custom_xjadeo_path_changed ()
{
- UIConfiguration::instance().set_xjadeo_binary (_custom_xjadeo_path.get_text());
+ _rc_config->set_xjadeo_binary (_custom_xjadeo_path.get_text());
}
void xjadeo_browse_clicked ()
{
Gtk::FileChooserDialog dialog(_("Set Video Monitor Executable"), Gtk::FILE_CHOOSER_ACTION_OPEN);
- dialog.set_filename (UIConfiguration::instance().get_xjadeo_binary());
+ dialog.set_filename (_rc_config->get_xjadeo_binary());
dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
dialog.add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
if (dialog.run () == Gtk::RESPONSE_OK) {
#endif
Glib::file_test (filename, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE)
)) {
- UIConfiguration::instance().set_xjadeo_binary (filename);
+ _rc_config->set_xjadeo_binary (filename);
}
}
}
_video_server_docroot_entry.set_sensitive(x);
_video_server_url_entry.set_sensitive(x);
} else if (p == "xjadeo-binary") {
- _custom_xjadeo_path.set_text (UIConfiguration::instance().get_xjadeo_binary());
+ _custom_xjadeo_path.set_text (_rc_config->get_xjadeo_binary());
}
}
return;
}
- boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
- if (backend) {
- ARDOUR::PortEngine::PortHandle ph = backend->get_port_by_name ((*iter)[midi_port_columns.name]);
- if (ph) {
- backend->set_port_property (ph, "http://jackaudio.org/metadata/pretty-name", new_text, "");
- (*iter)[midi_port_columns.pretty_name] = new_text;
- }
- }
+ AudioEngine::instance()->set_midi_port_pretty_name ((*iter)[midi_port_columns.name], new_text);
}
/*============*/
RCOptionEditor::RCOptionEditor ()
: OptionEditorContainer (Config, string_compose (_("%1 Preferences"), PROGRAM_NAME))
- , Tabbable (*this, _("Preferences")) /* pack self-as-vbox into tabbable */
+ , Tabbable (*this, _("Preferences")
+#ifdef MIXBUS
+ , false // detached by default (first start, no instant.xml)
+#endif
+ ) /* pack self-as-vbox into tabbable */
, _rc_config (Config)
, _mixer_strip_visibility ("mixer-element-visibility")
{
uint32_t hwcpus = hardware_concurrency ();
BoolOption* bo;
- BoolComboOption* bco;
if (hwcpus > 1) {
add_option (_("General"), new OptionEditorHeading (_("DSP CPU Utilization")));
));
-#ifdef ENABLE_NLS
+#if ENABLE_NLS
add_option (_("General/Translation"), new OptionEditorHeading (_("Internationalization")));
add_option (_("General/Translation"), bo);
- _l10n = new ComboOption<ARDOUR::LocaleMode> (
- "locale-mode",
- _("Localization"),
- sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_locale_mode),
- sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_locale_mode)
- );
-
- _l10n->add (ARDOUR::SET_LC_ALL, _("Set complete locale"));
- _l10n->add (ARDOUR::SET_LC_MESSAGES, _("Enable only message translation"));
- _l10n->add (ARDOUR::SET_LC_MESSAGES_AND_LC_NUMERIC, _("Translate messages and format numeric format"));
- _l10n->set_note (_("This setting is provided for plugin compatibility. e.g. some plugins on some systems expect the decimal point to be a dot."));
-
- add_option (_("General/Translation"), _l10n);
parameter_changed ("enable-translation");
#endif // ENABLE_NLS
add_option (_("Editor"), new OptionEditorHeading (_("General")));
- add_option (_("Editor"),
- new BoolOption (
- "rubberbanding-snaps-to-grid",
- _("Snap rubberband to grid"),
- sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_rubberbanding_snaps_to_grid),
- sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_rubberbanding_snaps_to_grid)
- ));
-
bo = new BoolOption (
"name-new-markers",
_("Prompt for new marker names"),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_draggable_playhead)
));
+ ComboOption<float>* dps = new ComboOption<float> (
+ "draggable-playhead-speed",
+ _("Playhead dragging speed (%)"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_draggable_playhead_speed),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_draggable_playhead_speed)
+ );
+ dps->add (0.05, _("5%"));
+ dps->add (0.1, _("10%"));
+ dps->add (0.25, _("25%"));
+ dps->add (0.5, _("50%"));
+ dps->add (1.0, _("100%"));
+ add_option (_("Editor"), dps);
+
+ ComboOption<float>* eet = new ComboOption<float> (
+ "extra-ui-extents-time",
+ _("Limit zooming & summary view to X minutes beyond session extents"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_extra_ui_extents_time),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_extra_ui_extents_time)
+ );
+ eet->add (1, _("1 minute"));
+ eet->add (2, _("2 minutes"));
+ eet->add (20, _("20 minutes"));
+ eet->add (60, _("1 hour"));
+ eet->add (60*2, _("2 hours"));
+ eet->add (60*24, _("24 hours"));
+ add_option (_("Editor"), eet);
+
if (!Profile->get_mixbus()) {
add_option (_("Editor"),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_automation_follows_regions)
));
+ bo = new BoolOption (
+ "new-automation-points-on-lane",
+ _("Ignore Y-axis click position when adding new automation-points"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_new_automation_points_on_lane),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_new_automation_points_on_lane)
+ );
+ add_option (_("Editor"), bo);
+ Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+ _("<b>When enabled</b> The new points drawn in any automation lane will be placed on the existing line, regardless of mouse y-axis position."));
+
ComboOption<FadeShape>* fadeshape = new ComboOption<FadeShape> (
"default-fade-shape",
_("Default fade shape"),
add_option (_("Editor"), fadeshape);
- bco = new BoolComboOption (
- "use-overlap-equivalency",
- _("Regions in edit groups are edited together"),
- _("whenever they overlap in time"),
- _("only if they have identical length and position"),
- sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_overlap_equivalency),
- sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_overlap_equivalency)
+ ComboOption<RegionEquivalence> *eqv = new ComboOption<RegionEquivalence> (
+ "region-equivalence",
+ _("Regions in active edit groups are edited together"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_region_equivalence),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_region_equivalence)
);
- add_option (_("Editor"), bco);
+ eqv->add (Overlap, _("whenever they overlap in time"));
+ eqv->add (Enclosed, _("if either encloses the other"));
+ eqv->add (Exact, _("only if they have identical length, position and origin"));
+
+ add_option (_("Editor"), eqv);
ComboOption<LayerModel>* lm = new ComboOption<LayerModel> (
"layer-model",
add_option (_("Editor"), rsas);
+ add_option (_("Editor/Snap"), new OptionEditorHeading (_("General Snap options:")));
+
+ add_option (_("Editor/Snap"),
+ new SpinOption<uint32_t> (
+ "snap-threshold",
+ _("Snap Threshold (pixels)"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_snap_threshold),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_snap_threshold),
+ 10, 200,
+ 1, 10
+ ));
+
+ add_option (_("Editor/Snap"),
+ new BoolOption (
+ "show-snapped-cursor",
+ _("Show \"snapped cursor\""),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_snapped_cursor),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_snapped_cursor)
+ ));
+
+ add_option (_("Editor/Snap"),
+ new BoolOption (
+ "rubberbanding-snaps-to-grid",
+ _("Snap rubberband selection to grid"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_rubberbanding_snaps_to_grid),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_rubberbanding_snaps_to_grid)
+ ));
+
+ add_option (_("Editor/Snap"),
+ new BoolOption (
+ "grid-follows-internal",
+ _("Grid switches to alternate selection for Internal Edit tools"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_grid_follows_internal),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_grid_follows_internal)
+ ));
+
+ add_option (_("Editor/Snap"),
+ new BoolOption (
+ "rulers-follow-grid",
+ _("Rulers automatically change to follow the Grid mode selection"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_rulers_follow_grid),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_rulers_follow_grid)
+ ));
+
+ add_option (_("Editor/Snap"), new OptionEditorHeading (_("When \"Snap\" is enabled, snap to:")));
+
+
+ add_option (_("Editor/Snap"),
+ new BoolOption (
+ "snap-to-marks",
+ _("Markers"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_snap_to_marks),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_snap_to_marks)
+ ));
+
+ add_option (_("Editor/Snap"),
+ new BoolOption (
+ "snap-to-region-sync",
+ _("Region Sync Points"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_snap_to_region_sync),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_snap_to_region_sync)
+ ));
+
+ add_option (_("Editor/Snap"),
+ new BoolOption (
+ "snap-to-region-start",
+ _("Region Starts"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_snap_to_region_start),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_snap_to_region_start)
+ ));
+
+ add_option (_("Editor/Snap"),
+ new BoolOption (
+ "snap-to-region-end",
+ _("Region Ends"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_snap_to_region_end),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_snap_to_region_end)
+ ));
+
+ add_option (_("Editor/Snap"),
+ new BoolOption (
+ "snap-to-grid",
+ _("Grid"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_snap_to_grid),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_snap_to_grid)
+ ));
+
add_option (_("Editor/Modifiers"), new OptionEditorHeading (_("Keyboard Modifiers")));
add_option (_("Editor/Modifiers"), new KeyboardOptions);
add_option (_("Editor/Modifiers"), new OptionEditorBlank ());
bo = new BoolOption (
"strict-io",
- _("Use 'Strict-I/O' for new tracks or Busses"),
+ _("Use 'Strict-I/O' for new tracks or busses"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_strict_io),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_strict_io)
);
add_option (_("Metronome"), new OptionEditorHeading (_("Metronome")));
add_option (_("Metronome"), new ClickOptions (_rc_config));
+ add_option (_("Metronome"), new OptionEditorHeading (_("Options")));
+
+ bo = new BoolOption (
+ "click-record-only",
+ _("Enable metronome only while recording"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_click_record_only),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_click_record_only)
+ );
+
+ Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+ string_compose (_("<b>When enabled</b> the metronome will remain silent if %1 is <b>not recording</b>."), PROGRAM_NAME));
+ add_option (_("Metronome"), bo);
+ add_option (_("Metronome"), new OptionEditorBlank ());
+
/* Meters */
add_option (S_("Preferences|Metering"), mvu);
+ HSliderOption *mpks = new HSliderOption("meter-peak",
+ _("Peak indicator threshold [dBFS]"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_peak),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_peak),
+ -10, 0, .1, .1
+ );
+
+ Gtkmm2ext::UI::instance()->set_tip (
+ mpks->tip_widget(),
+ _("Specify the audio signal level in dBFS at and above which the meter-peak indicator will flash red."));
+
+ add_option (S_("Preferences|Metering"), mpks);
+
+ OptionEditorHeading* default_meter_head = new OptionEditorHeading (_("Default Meter Types"));
+ default_meter_head->set_note (_("These settings apply to newly created tracks and busses. For the Master bus, this will be when a new session is created."));
+
+ add_option (S_("Preferences|Metering"), default_meter_head);
+
ComboOption<MeterType>* mtm = new ComboOption<MeterType> (
"meter-type-master",
_("Default Meter Type for Master Bus"),
ComboOption<MeterType>* mtb = new ComboOption<MeterType> (
"meter-type-bus",
- _("Default Meter Type for Busses"),
+ _("Default meter type for busses"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_type_bus),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_type_bus)
);
ComboOption<MeterType>* mtt = new ComboOption<MeterType> (
"meter-type-track",
- _("Default Meter Type for Tracks"),
+ _("Default meter type for tracks"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_type_track),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_type_track)
);
add_option (S_("Preferences|Metering"), mtt);
- HSliderOption *mpks = new HSliderOption("meter-peak",
- _("Peak threshold [dBFS]"),
- sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_peak),
- sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_peak),
- -10, 0, .1, .1
- );
-
- Gtkmm2ext::UI::instance()->set_tip (
- mpks->tip_widget(),
- _("Specify the audio signal level in dBFS at and above which the meter-peak indicator will flash red."));
-
- add_option (S_("Preferences|Metering"), mpks);
-
add_option (S_("Preferences|Metering"), new OptionEditorHeading (_("Post Export Analysis")));
add_option (S_("Preferences|Metering"),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_quieten_at_speed)
);
Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
- _("<b>When enabled</b> rhis will reduce the unpleasant increase in perceived volume "
+ _("<b>When enabled</b> this will reduce the unpleasant increase in perceived volume "
"that occurs when fast-forwarding or rewinding through some kinds of audio"));
add_option (_("Transport"), bo);
/* SYNC */
- add_option (_("Sync"), new OptionEditorHeading (_("External Syncronization")));
+ add_option (_("Sync"), new OptionEditorHeading (_("Transport Masters")));
- _sync_source = new ComboOption<SyncSource> (
- "sync-source",
- _("External timecode source"),
- sigc::mem_fun (*_rc_config, &RCConfiguration::get_sync_source),
- sigc::mem_fun (*_rc_config, &RCConfiguration::set_sync_source)
- );
-
- add_option (_("Sync"), _sync_source);
+ add_option (_("Sync"), new WidgetOption (X_("foo"), X_("Transport Masters"), _transport_masters_widget));
_sync_framerate = new BoolOption (
"timecode-sync-frame-rate",
add_option (_("Sync"), _sync_framerate);
- _sync_genlock = new BoolOption (
- "timecode-source-is-synced",
- _("Sync-lock timecode to clock (disable drift compensation)"),
- 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(),
- string_compose (_("<b>When enabled</b> %1 will never varispeed when slaved to external timecode. "
- "Sync Lock indicates that the selected external timecode source shares clock-sync "
- "(Black & Burst, Wordclock, etc) with the audio interface. "
- "This option disables drift compensation. The transport speed is fixed at 1.0. "
- "Vari-speed LTC will be ignored and cause drift."
- "\n\n"
- "<b>When disabled</b> %1 will compensate for potential drift, regardless if the "
- "timecode sources shares clock sync."
- ), PROGRAM_NAME));
-
-
- add_option (_("Sync"), _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(),
- _("<b>When enabled</b> 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 vendors 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 (_("Sync"), _sync_source_2997);
-
- add_option (_("Sync/LTC"), new OptionEditorHeading (_("Linear Timecode (LTC) Reader")));
-
- _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<string> physical_inputs;
- physical_inputs.push_back (_("None"));
- AudioEngine::instance()->get_physical_inputs (DataType::AUDIO, physical_inputs);
- _ltc_port->set_popdown_strings (physical_inputs);
-
- populate_sync_options ();
- AudioEngine::instance()->Running.connect (engine_started_connection, MISSING_INVALIDATOR, boost::bind (&RCOptionEditor::populate_sync_options, this), gui_context());
-
- add_option (_("Sync/LTC"), _ltc_port);
-
add_option (_("Sync/LTC"), new OptionEditorHeading (_("Linear Timecode (LTC) Generator")));
add_option (_("Sync/LTC"),
_("Inbound MMC device ID"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_mmc_receive_device_id),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_mmc_receive_device_id),
- 0, 128, 1, 10
+ 0, 127, 1, 10
));
add_option (_("Sync/MIDI"),
_("Outbound MMC device ID"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_mmc_send_device_id),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_mmc_send_device_id),
- 0, 128, 1, 10
+ 0, 127, 1, 10
));
add_option (_("MIDI Ports"),
new BoolOption (
- "get-midi-input-follows-selection",
+ "midi-input-follows-selection",
_("MIDI input follows MIDI track selection"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_midi_input_follows_selection),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_midi_input_follows_selection)
Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
_("<b>When enabled</b> plugins will be activated when they are added to tracks/busses. When disabled plugins will be left inactive when they are added to tracks/busses"));
+ ComboOption<uint32_t>* lna = new ComboOption<uint32_t> (
+ "limit-n-automatables",
+ _("Limit automatable parameters per plugin"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_limit_n_automatables),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_limit_n_automatables)
+ );
+ lna->add (0, _("Unlimited"));
+ lna->add (64, _("64 parameters"));
+ lna->add (128, _("128 parameters"));
+ lna->add (256, _("256 parameters"));
+ lna->add (512, _("512 parameters"));
+ lna->add (999, _("999 parameters"));
+ add_option (_("Plugins"), lna);
+ Gtkmm2ext::UI::instance()->set_tip (lna->tip_widget(),
+ _("Some Plugins expose an unreasonable amount of control-inputs. This option limits the number of parameters that can are listed as automatable without restricting the number of total controls.\n\nThis reduces lag in the GUI and shortens excessively long drop-down lists for plugins with a large number of control ports.\n\nNote: This only affects newly added plugins and is applied to plugin on session-reload. Already automated parameters are retained."));
+
+
#if (defined WINDOWS_VST_SUPPORT || defined MACVST_SUPPORT || defined LXVST_SUPPORT)
add_option (_("Plugins/VST"), new OptionEditorHeading (_("VST")));
#if 0
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_blink_rec_arm)
));
+ add_option (_("Appearance"),
+ new BoolOption (
+ "blink-alert-indicators",
+ _("Blink Alert Indicators"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_blink_alert_indicators),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_blink_alert_indicators)
+ ));
+
#ifndef __APPLE__
/* font scaling does nothing with GDK/Quartz */
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_never_display_periodic_midi)
));
+
+ add_option (_("Appearance/Editor"),
+ new BoolOption (
+ "use-note-bars-for-velocity",
+ _("Show velocity horizontally inside notes"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_note_bars_for_velocity),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_note_bars_for_velocity)
+ ));
+
+ add_option (_("Appearance/Editor"),
+ new BoolOption (
+ "use-note-color-for-velocity",
+ _("Use colors to show note velocity"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_note_color_for_velocity),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_note_color_for_velocity)
+ ));
+
add_option (_("Appearance/Editor"), new OptionEditorBlank ());
/* The names of these controls must be the same as those given in MixerStrip
add_option (_("Appearance/Mixer"),
new BoolOption (
"default-narrow_ms",
- _("Use narrow strips in the mixer by default"),
+ _("Use narrow strips in the mixer for new strips by default"),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_default_narrow_ms),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_default_narrow_ms)
));
+ ComboOption<uint32_t>* mic = new ComboOption<uint32_t> (
+ "max-inline-controls",
+ _("Limit inline-mixer-strip controls per plugin"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_max_inline_controls),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_max_inline_controls)
+ );
+ mic->add (0, _("Unlimited"));
+ mic->add (16, _("16 parameters"));
+ mic->add (32, _("32 parameters"));
+ mic->add (64, _("64 parameters"));
+ mic->add (128, _("128 parameters"));
+ add_option (_("Appearance/Mixer"), mic);
+
add_option (_("Appearance/Mixer"), new OptionEditorBlank ());
add_option (_("Appearance/Toolbar"), new OptionEditorHeading (_("Main Transport Toolbar Items")));
add_option (_("Appearance/Toolbar"),
new ColumVisibilityOption (
- "action-table-columns", _("Lua Action Script Button Visibility"), 4,
+ "action-table-columns", _("Display Action-Buttons"), 4,
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_action_table_columns),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_action_table_columns)
)
add_option (_("Appearance/Toolbar"), new OptionEditorBlank ());
- OptionEditorHeading* quirks_head = new OptionEditorHeading (_("Various Workarounds for Windowing Systems"));
-
- quirks_head->set_note (string_compose (_("Rules for closing, minimizing, maximizing, and stay-on-top can vary\n\
-with each version of your OS, and the preferences that you've set in your OS.\n\n\
-You can adjust the options, below, to change how %1's windows and dialogs behave.\n\n\
-These settings will only take effect after %1 is restarted.\n\
- "), PROGRAM_NAME));
-
/* and now the theme manager */
add_option (_("Appearance/Theme"), new OptionEditorHeading (_("Theme")));
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_flat_buttons)
));
+ add_option (_("Appearance/Theme"), new BoolOption (
+ "boxy-buttons",
+ _("Draw \"boxy\" buttons"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_boxy_buttons),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_boxy_buttons)
+ ));
+
add_option (_("Appearance/Theme"), new BoolOption (
"meter-style-led",
_("LED meter style"),
/* Quirks */
+ OptionEditorHeading* quirks_head = new OptionEditorHeading (_("Various Workarounds for Windowing Systems"));
+
+ quirks_head->set_note (string_compose (_("Rules for closing, minimizing, maximizing, and stay-on-top can vary \
+with each version of your OS, and the preferences that you've set in your OS.\n\n\
+You can adjust the options, below, to change how %1's windows and dialogs behave.\n\n\
+These settings will only take effect after %1 is restarted.\n\
+ "), PROGRAM_NAME));
+
add_option (_("Appearance/Quirks"), quirks_head);
bo = new BoolOption (
set_current_page (_("General"));
}
+void
+RCOptionEditor::set_session (Session *s)
+{
+ SessionHandlePtr::set_session (s);
+ _transport_masters_widget.set_session (s);
+}
+
void
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);
+ boost::shared_ptr<TransportMaster> tm (TransportMasterManager::instance().current());
+ if (boost::dynamic_pointer_cast<TimecodeTransportMaster> (tm)) {
_sync_framerate->set_sensitive (true);
- _sync_source_2997->set_sensitive (true);
- break;
- default:
- _sync_genlock->set_sensitive (false);
+ } else {
_sync_framerate->set_sensitive (false);
- _sync_source_2997->set_sensitive (false);
- break;
}
} else if (p == "send-ltc") {
bool const s = Config->get_send_ltc ();
} else if (p == "open-gui-after-adding-plugin" || p == "show-inline-display-by-default") {
#if (defined LV2_SUPPORT && defined LV2_EXTENDED)
_plugin_prefer_inline->set_sensitive (UIConfiguration::instance().get_open_gui_after_adding_plugin() && UIConfiguration::instance().get_show_inline_display_by_default());
-#endif
-#ifdef ENABLE_NLS
- } else if (p == "enable-translation") {
- _l10n->set_sensitive (ARDOUR::translations_are_enabled ());
#endif
}
}
void RCOptionEditor::edit_lxvst_path () {
Glib::RefPtr<Gdk::Window> win = get_parent_window ();
- Gtkmm2ext::PathsDialog *pd = new Gtkmm2ext::PathsDialog (
+ PathsDialog *pd = new PathsDialog (
*current_toplevel(), _("Set Linux VST Search Path"),
_rc_config->get_plugin_path_lxvst(),
PluginManager::instance().get_default_lxvst_path()
false /*no markup*/, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_YES_NO, true /*modal*/);
msg.set_default_response (Gtk::RESPONSE_YES);
if (msg.run() == Gtk::RESPONSE_YES) {
+ msg.hide ();
plugin_scan_refresh ();
}
}
}
void RCOptionEditor::edit_vst_path () {
- Gtkmm2ext::PathsDialog *pd = new Gtkmm2ext::PathsDialog (
+ PathsDialog *pd = new PathsDialog (
*current_toplevel(), _("Set Windows VST Search Path"),
_rc_config->get_plugin_path_vst(),
PluginManager::instance().get_default_windows_vst_path()
false /*no markup*/, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_YES_NO, true /*modal*/);
msg.set_default_response (Gtk::RESPONSE_YES);
if (msg.run() == Gtk::RESPONSE_YES) {
+ msg.hide ();
plugin_scan_refresh ();
}
}
delete pd;
}
-
-void
-RCOptionEditor::populate_sync_options ()
-{
- vector<SyncSource> sync_opts = ARDOUR::get_available_sync_options ();
-
- _sync_source->clear ();
-
- for (vector<SyncSource>::iterator i = sync_opts.begin(); i != sync_opts.end(); ++i) {
- _sync_source->add (*i, sync_source_to_string (*i));
- }
-
- if (sync_opts.empty()) {
- _sync_source->set_sensitive(false);
- } else {
- if (std::find(sync_opts.begin(), sync_opts.end(), _rc_config->get_sync_source()) == sync_opts.end()) {
- _rc_config->set_sync_source(sync_opts.front());
- }
- }
-
- parameter_changed ("sync-source");
-}
-
Gtk::Window*
RCOptionEditor::use_own_window (bool and_fill_it)
{
projects / ardour.git / blobdiff