#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"
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));
}
RCConfiguration* _rc_config;
- ArdourDialog* _parent;
+ Gtk::Window* _parent;
Entry _click_path_entry;
Entry _click_emphasis_path_entry;
};
_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);
/* 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 },
{ "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 },
vector<string> 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);
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;
}
}
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);
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);
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);
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);
_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);
class ControlSurfacesOptions : public OptionEditorBox
{
public:
- ControlSurfacesOptions (ArdourDialog& parent)
+ ControlSurfacesOptions (Gtk::Window& parent)
: _parent (parent)
{
_store = ListStore::create (_model);
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;
}
}
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;
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<float>* mht = new ComboOption<float> (
- "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<float>* mfo = new ComboOption<float> (
- "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",
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 (
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<uint32_t> (
+ "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<double> (
+ "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"),
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 (
"disable-disarm-during-roll",
sigc::mem_fun (*_rc_config, &RCConfiguration::set_quieten_at_speed)
));
+ add_option (_("Transport"), new OptionEditorHeading (S_("Sync/Slave")));
+
+ BoolOption* tsf = new BoolOption (
+ "timecode-sync-frame-rate",
+ _("Force Ardour's timecode rate to match an external source"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_timecode_sync_frame_rate),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_timecode_sync_frame_rate)
+ );
+ tsf->set_note (_("If off, slaving to timecode will cause Ardour to chase the external sync source\nbut it will use its own timecode frame rate"));
+ add_option (_("Transport"), tsf);
+
+ add_option (_("Transport"), new BoolOption (
+ "timecode-source-is-synced",
+ _("Timecode source shares sample clock with audio interface"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_timecode_source_is_synced),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_timecode_source_is_synced)
+ ));
+
/* EDITOR */
add_option (_("Editor"),
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<WaveformScale>* wfs = new ComboOption<WaveformScale> (
"waveform-scale",
_("Waveform scale"),
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")));
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()) {
mm->add (SoftwareMonitoring, _("ardour"));
mm->add (ExternalMonitoring, _("audio hardware"));
+ add_option (_("Audio"), mm);
+
add_option (_("Audio"),
new BoolOption (
"tape-machine-mode",
}
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);
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)
));
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 (_("Control surfaces"), new ControlSurfacesOptions (*this));
+ 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 (_("User interaction"), new ControlSurfacesOptions (*this));
ComboOption<RemoteModel>* rm = new ComboOption<RemoteModel> (
"remote-model",
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.
_mixer_strip_visibility.add (0, X_("MeterPoint"), _("Meter Point"));
add_option (
- _("Interface"),
+ S_("GUI"),
new VisibilityOption (
_("Mixer Strip"),
&_mixer_strip_visibility,
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<float>* mht = new ComboOption<float> (
+ "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<float>* mfo = new ComboOption<float> (
+ "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
projects / ardour.git / blobdiff