#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)
{
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));
+ _click_emphasis_path_entry.signal_activate().connect (sigc::mem_fun (*this, &ClickOptions::click_emphasis_changed));
}
void parameter_changed (string const & p)
_rc_config->set_click_sound (path);
}
+ void click_changed ()
+ {
+ click_chosen (_click_path_entry.get_text ());
+ }
+
void click_emphasis_browse_clicked ()
{
SoundFileChooser sfdb (*_parent, _("Choose Click Emphasis"));
_rc_config->set_click_emphasis_sound (path);
}
+ void click_emphasis_changed ()
+ {
+ click_emphasis_chosen (_click_emphasis_path_entry.get_text ());
+ }
+
RCConfiguration* _rc_config;
- ArdourDialog* _parent;
+ Gtk::Window* _parent;
Entry _click_path_entry;
Entry _click_emphasis_path_entry;
};
class ControlSurfacesOptions : public OptionEditorBox
{
public:
- ControlSurfacesOptions (ArdourDialog& parent)
+ ControlSurfacesOptions (Gtk::Window& parent)
: _parent (parent)
{
_store = ListStore::create (_model);
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->add (*box);
box->show ();
win->present ();
row[_model.editor] = win;
Gtk::Window& _parent;
};
+/** A class which allows control of visibility of some editor components usign
+ * a VisibilityGroup. The caller should pass in a `dummy' VisibilityGroup
+ * which has the correct members, but with null widget pointers. This
+ * class allows the user to set visibility of the members, the details
+ * of which are stored in a configuration variable which can be watched
+ * by parts of the editor that actually contain the widgets whose visibility
+ * is being controlled.
+ */
+
+class VisibilityOption : public Option
+{
+public:
+ /** @param name User-visible name for this group.
+ * @param g `Dummy' VisibilityGroup (as described above).
+ * @param get Method to get the value of the appropriate configuration variable.
+ * @param set Method to set the value of the appropriate configuration variable.
+ */
+ VisibilityOption (string name, VisibilityGroup* g, sigc::slot<string> get, sigc::slot<bool, string> set)
+ : Option (g->get_state_name(), name)
+ , _heading (name)
+ , _visibility_group (g)
+ , _get (get)
+ , _set (set)
+ {
+ /* Watch for changes made by the user to our members */
+ _visibility_group->VisibilityChanged.connect_same_thread (
+ _visibility_group_connection, sigc::bind (&VisibilityOption::changed, this)
+ );
+ }
+
+ void set_state_from_config ()
+ {
+ /* Set our state from the current configuration */
+ _visibility_group->set_state (_get ());
+ }
+
+ void add_to_page (OptionEditorPage* p)
+ {
+ _heading.add_to_page (p);
+ add_widget_to_page (p, _visibility_group->list_view ());
+ }
+
+private:
+ void changed ()
+ {
+ /* The user has changed something, so reflect this change
+ in the RCConfiguration.
+ */
+ _set (_visibility_group->get_state_value ());
+ }
+
+ OptionEditorHeading _heading;
+ VisibilityGroup* _visibility_group;
+ sigc::slot<std::string> _get;
+ sigc::slot<bool, std::string> _set;
+ PBD::ScopedConnection _visibility_group_connection;
+};
+
RCOptionEditor::RCOptionEditor ()
: OptionEditor (Config, string_compose (_("%1 Preferences"), PROGRAM_NAME))
, _rc_config (Config)
+ , _mixer_strip_visibility ("mixer-strip-visibility")
{
/* MISC */
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 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 (_("Misc")));
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 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 (_("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 OptionEditorHeading (_("Click")));
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)
+ ));
+
/* AUDIO */
add_option (_("Audio"), new OptionEditorHeading (_("Buffering")));
add_option (_("Audio"), mm);
- ComboOption<PFLPosition>* pp = new ComboOption<PFLPosition> (
- "pfl-position",
- _("PFL signals come from"),
- sigc::mem_fun (*_rc_config, &RCConfiguration::get_pfl_position),
- sigc::mem_fun (*_rc_config, &RCConfiguration::set_pfl_position)
- );
-
- pp->add (PFLFromBeforeProcessors, _("before pre-fader processors"));
- pp->add (PFLFromAfterProcessors, _("pre-fader but after pre-fader processors"));
-
- add_option (_("Audio"), pp);
-
- ComboOption<AFLPosition>* pa = new ComboOption<AFLPosition> (
- "afl-position",
- _("AFL signals come from"),
- sigc::mem_fun (*_rc_config, &RCConfiguration::get_afl_position),
- sigc::mem_fun (*_rc_config, &RCConfiguration::set_afl_position)
- );
-
- pa->add (AFLFromBeforeProcessors, _("post-fader but before post-fader processors"));
- pa->add (AFLFromAfterProcessors, _("after post-fader processors"));
-
- add_option (_("Audio"), pa);
-
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);
sigc::mem_fun (*_rc_config, &RCConfiguration::set_listen_position)
);
- _listen_position->add (AfterFaderListen, _("after-fader listen"));
- _listen_position->add (PreFaderListen, _("pre-fader listen"));
+ _listen_position->add (AfterFaderListen, _("after-fader (AFL)"));
+ _listen_position->add (PreFaderListen, _("pre-fader (PFL)"));
add_option (_("Solo / mute"), _listen_position);
+ ComboOption<PFLPosition>* pp = new ComboOption<PFLPosition> (
+ "pfl-position",
+ _("PFL signals come from"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_pfl_position),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_pfl_position)
+ );
+
+ pp->add (PFLFromBeforeProcessors, _("before pre-fader processors"));
+ pp->add (PFLFromAfterProcessors, _("pre-fader but after pre-fader processors"));
+
+ add_option (_("Solo / mute"), pp);
+
+ ComboOption<AFLPosition>* pa = new ComboOption<AFLPosition> (
+ "afl-position",
+ _("AFL signals come from"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_afl_position),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_afl_position)
+ );
+
+ pa->add (AFLFromBeforeProcessors, _("immediately post-fader"));
+ pa->add (AFLFromAfterProcessors, _("after post-fader processors (before pan)"));
+
+ add_option (_("Solo / mute"), pa);
+
parameter_changed ("use-monitor-bus");
add_option (_("Solo / mute"),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_mute_affects_main_outs)
));
- add_option (_("MIDI control"),
+ add_option (_("MIDI"),
new BoolOption (
"send-midi-clock",
_("Send MIDI Clock"),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_send_midi_clock)
));
- add_option (_("MIDI control"),
+ add_option (_("MIDI"),
new BoolOption (
"send-mtc",
_("Send MIDI Time Code"),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_send_mtc)
));
- add_option (_("MIDI control"),
+ add_option (_("MIDI"),
new SpinOption<int> (
"mtc-qf-speed-tolerance",
_("Percentage either side of normal transport speed to transmit MTC"),
0, 20, 1, 5
));
- add_option (_("MIDI control"),
+ add_option (_("MIDI"),
new BoolOption (
"mmc-control",
_("Obey MIDI Machine Control commands"),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_mmc_control)
));
- add_option (_("MIDI control"),
+ add_option (_("MIDI"),
new BoolOption (
"send-mmc",
_("Send MIDI Machine Control commands"),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_send_mmc)
));
- add_option (_("MIDI control"),
+ add_option (_("MIDI"),
new BoolOption (
"midi-feedback",
_("Send MIDI control feedback"),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_midi_feedback)
));
- add_option (_("MIDI control"),
+ add_option (_("MIDI"),
new SpinOption<uint8_t> (
"mmc-receive-device-id",
_("Inbound MMC device ID"),
0, 128, 1, 10
));
- add_option (_("MIDI control"),
+ add_option (_("MIDI"),
new SpinOption<uint8_t> (
"mmc-send-device-id",
_("Outbound MMC device ID"),
0, 128, 1, 10
));
- add_option (_("MIDI control"),
+ add_option (_("MIDI"),
new SpinOption<int32_t> (
"initial-program-change",
_("Initial program change"),
-1, 65536, 1, 10
));
- /* CONTROL SURFACES */
+ add_option (_("MIDI"),
+ new BoolOption (
+ "diplay-first-midi-bank-as-zero",
+ _("Display first MIDI bank/program as 0"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_first_midi_bank_is_zero),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_first_midi_bank_is_zero)
+ ));
- add_option (_("Control surfaces"), new ControlSurfacesOptions (*this));
+ /* 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 (_("Visual|Interface"),
+ 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)
+ ));
+
+#ifndef GTKOSX
+ /* font scaling does nothing with GDK/Quartz */
+ add_option (_("Visual|Interface"), new FontScalingOptions (_rc_config));
+#endif
+
+ /* 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_("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 (
+ _("Visual|Interface"),
+ new VisibilityOption (
+ _("Mixer Strip"),
+ &_mixer_strip_visibility,
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_mixer_strip_visibility),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_mixer_strip_visibility)
+ )
+ );
+
+ add_option (_("Visual|Interface"),
+ new BoolOption (
+ "default-narrow_ms",
+ _("Use narrow mixer strips by default"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_default_narrow_ms),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_narrow_ms)
+ ));
+
+ add_option (_("Visual|Interface"), 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 (_("Visual|Interface"), 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 (_("Keyboard"), new KeyboardOptions);
+ add_option (_("Visual|Interface"), mfo);
}
void