#include <gtkmm/scale.h>
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/slider_controller.h>
+
#include "pbd/fpu.h"
+#include "pbd/cpus.h"
+
#include "midi++/manager.h"
-#include "midi++/factory.h"
+
+#include "ardour/audioengine.h"
#include "ardour/dB.h"
#include "ardour/rc_configuration.h"
#include "ardour/control_protocol_manager.h"
#include "control_protocol/control_protocol.h"
+
+#include "gui_thread.h"
+#include "midi_tracer.h"
#include "rc_option_editor.h"
#include "utils.h"
#include "midi_port_dialog.h"
using namespace PBD;
using namespace ARDOUR;
-class MIDIPorts : public OptionEditorBox
-{
-public:
- MIDIPorts (RCConfiguration* c, list<ComboOption<string>* > const & o)
- : _rc_config (c),
- _add_port_button (Stock::ADD),
- _port_combos (o)
- {
- _store = ListStore::create (_model);
- _view.set_model (_store);
- _view.append_column (_("Name"), _model.name);
- _view.get_column(0)->set_resizable (true);
- _view.get_column(0)->set_expand (true);
- _view.append_column_editable (_("Online"), _model.online);
- _view.append_column_editable (_("Trace input"), _model.trace_input);
- _view.append_column_editable (_("Trace output"), _model.trace_output);
-
- HBox* h = manage (new HBox);
- h->set_spacing (4);
- h->pack_start (_view, true, true);
-
- VBox* v = manage (new VBox);
- v->set_spacing (4);
- v->pack_start (_add_port_button, false, false);
- h->pack_start (*v, false, false);
-
- _box->pack_start (*h);
-
- ports_changed ();
-
- _store->signal_row_changed().connect (sigc::mem_fun (*this, &MIDIPorts::model_changed));
-
- _add_port_button.signal_clicked().connect (sigc::mem_fun (*this, &MIDIPorts::add_port_clicked));
- }
-
- void parameter_changed (string const &) {}
- void set_state_from_config () {}
-
-private:
-
- void model_changed (TreeModel::Path const &, TreeModel::iterator const & i)
- {
- TreeModel::Row r = *i;
-
- MIDI::Port* port = r[_model.port];
- if (!port) {
- return;
- }
-
- if (port->input()) {
-
- if (r[_model.online] == port->input()->offline()) {
- port->input()->set_offline (!r[_model.online]);
- }
-
- if (r[_model.trace_input] != port->input()->tracing()) {
- port->input()->trace (r[_model.trace_input], &cerr, string (port->name()) + _(" input: "));
- }
- }
-
- if (port->output()) {
-
- if (r[_model.trace_output] != port->output()->tracing()) {
- port->output()->trace (r[_model.trace_output], &cerr, string (port->name()) + _(" output: "));
- }
-
- }
- }
-
- void setup_ports_combo (ComboOption<string>* c)
- {
- c->clear ();
- MIDI::Manager::PortList const & ports = MIDI::Manager::instance()->get_midi_ports ();
- for (MIDI::Manager::PortList::const_iterator i = ports.begin(); i != ports.end(); ++i) {
- c->add ((*i)->name(), (*i)->name());
- }
- }
-
- void ports_changed ()
- {
- /* XXX: why is this coming from here? */
- MIDI::Manager::PortList const & ports = MIDI::Manager::instance()->get_midi_ports ();
-
- _store->clear ();
- port_connections.drop_connections ();
-
- for (MIDI::Manager::PortList::const_iterator i = ports.begin(); i != ports.end(); ++i) {
-
- TreeModel::Row r = *_store->append ();
-
- r[_model.name] = (*i)->name();
-
- if ((*i)->input()) {
- r[_model.online] = !(*i)->input()->offline();
- (*i)->input()->OfflineStatusChanged.connect (port_connections, boost::bind (&MIDIPorts::port_offline_changed, this, (*i)));
- r[_model.trace_input] = (*i)->input()->tracing();
- }
-
- if ((*i)->output()) {
- r[_model.trace_output] = (*i)->output()->tracing();
- }
-
- r[_model.port] = (*i);
- }
-
- for (list<ComboOption<string>* >::iterator i = _port_combos.begin(); i != _port_combos.end(); ++i) {
- setup_ports_combo (*i);
- }
- }
-
- void port_offline_changed (MIDI::Port* p)
- {
- if (!p->input()) {
- return;
- }
-
- for (TreeModel::Children::iterator i = _store->children().begin(); i != _store->children().end(); ++i) {
- if ((*i)[_model.port] == p) {
- (*i)[_model.online] = !p->input()->offline();
- }
- }
- }
-
- void add_port_clicked ()
- {
- MidiPortDialog dialog;
-
- dialog.set_position (WIN_POS_MOUSE);
-
- dialog.show ();
-
- int const r = dialog.run ();
-
- switch (r) {
- case RESPONSE_ACCEPT:
- break;
- default:
- return;
- break;
- }
-
- Glib::ustring const mode = dialog.port_mode_combo.get_active_text ();
- string smod;
-
- if (mode == _("input")) {
- smod = X_("input");
- } else if (mode == (_("output"))) {
- smod = X_("output");
- } else {
- smod = "duplex";
- }
-
- XMLNode node (X_("MIDI-port"));
-
- node.add_property ("tag", dialog.port_name.get_text());
- node.add_property ("device", X_("ardour")); // XXX this can't be right for all types
- node.add_property ("type", MIDI::PortFactory::default_port_type());
- node.add_property ("mode", smod);
-
- if (MIDI::Manager::instance()->add_port (node) != 0) {
- cerr << " there are now " << MIDI::Manager::instance()->nports() << endl;
- ports_changed ();
- }
- }
-
- class MIDIModelColumns : public TreeModelColumnRecord
- {
- public:
- MIDIModelColumns ()
- {
- add (name);
- add (online);
- add (trace_input);
- add (trace_output);
- add (port);
- }
-
- TreeModelColumn<string> name;
- TreeModelColumn<bool> online;
- TreeModelColumn<bool> trace_input;
- TreeModelColumn<bool> trace_output;
- TreeModelColumn<MIDI::Port*> port;
- };
-
- RCConfiguration* _rc_config;
- Glib::RefPtr<ListStore> _store;
- MIDIModelColumns _model;
- TreeView _view;
- Button _add_port_button;
- ComboBoxText _mtc_combo;
- ComboBoxText _midi_clock_combo;
- ComboBoxText _mmc_combo;
- ComboBoxText _mpc_combo;
- list<ComboOption<string>* > _port_combos;
- PBD::ScopedConnectionList port_connections;
-};
-
-
class ClickOptions : public OptionEditorBox
{
public:
{ "Command", GDK_META_MASK },
{ "Control", GDK_CONTROL_MASK },
{ "Option", GDK_MOD1_MASK },
- { "Command-Shift", GDK_MOD1_MASK|GDK_SHIFT_MASK },
- { "Command-Option", GDK_MOD1_MASK|GDK_MOD5_MASK },
- { "Shift-Option", GDK_SHIFT_MASK|GDK_MOD5_MASK },
- { "Shift-Command-Option", GDK_MOD5_MASK|GDK_SHIFT_MASK|GDK_MOD1_MASK },
+ { "Command-Shift", GDK_META_MASK|GDK_SHIFT_MASK },
+ { "Command-Option", GDK_MOD1_MASK|GDK_META_MASK },
+ { "Shift-Option", GDK_SHIFT_MASK|GDK_MOD1_MASK },
+ { "Shift-Command-Option", GDK_MOD5_MASK|GDK_SHIFT_MASK|GDK_META_MASK },
#else
{ "Shift", GDK_SHIFT_MASK },
HScale _dpi_slider;
};
-class SoloMuteOptions : public OptionEditorBox
+class BufferingOptions : public OptionEditorBox
{
public:
- SoloMuteOptions (RCConfiguration* c) :
- _rc_config (c),
- // 0.781787 is the value needed for gain to be set to 0.
- _db_adjustment (0.781787, 0.0, 1.0, 0.01, 0.1)
-
+ BufferingOptions (RCConfiguration* c)
+ : _rc_config (c)
+ , _playback_adjustment (5, 1, 60, 1, 4)
+ , _capture_adjustment (5, 1, 60, 1, 4)
+ , _playback_slider (_playback_adjustment)
+ , _capture_slider (_capture_adjustment)
{
- if ((pix = ::get_icon ("fader_belt_h")) == 0) {
- throw failed_constructor();
- }
+ _playback_adjustment.set_value (_rc_config->get_audio_playback_buffer_seconds());
- _db_slider = manage (new HSliderController (pix,
- &_db_adjustment,
- false,
- 115));
+ Label* l = manage (new Label (_("Playback (seconds of buffering):")));
+ l->set_name ("OptionsLabel");
+ _playback_slider.set_update_policy (UPDATE_DISCONTINUOUS);
+ HBox* h = manage (new HBox);
+ h->set_spacing (4);
+ h->pack_start (*l, false, false);
+ h->pack_start (_playback_slider, true, true);
- parameter_changed ("solo-mute-gain");
+ _box->pack_start (*h, false, false);
+
+ _capture_adjustment.set_value (_rc_config->get_audio_capture_buffer_seconds());
- Label* l = manage (new Label (_("Solo mute cut (dB):")));
+ l = manage (new Label (_("Recording (seconds of buffering):")));
l->set_name ("OptionsLabel");
- HBox* h = manage (new HBox);
+ _capture_slider.set_update_policy (UPDATE_DISCONTINUOUS);
+ h = manage (new HBox);
h->set_spacing (4);
h->pack_start (*l, false, false);
- h->pack_start (*_db_slider, false, false);
- h->pack_start (_db_display, false, false);
-
- set_size_request_to_display_given_text (_db_display, "-99.0", 12, 12);
+ h->pack_start (_capture_slider, true, true);
_box->pack_start (*h, false, false);
-
- _db_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &SoloMuteOptions::db_changed));
+
+ _capture_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &BufferingOptions::capture_changed));
+ _playback_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &BufferingOptions::playback_changed));
}
void parameter_changed (string const & p)
{
- if (p == "solo-mute-gain") {
- gain_t val = _rc_config->get_solo_mute_gain();
-
- _db_adjustment.set_value (gain_to_slider_position (val));
-
- char buf[16];
-
- if (val == 0.0) {
- snprintf (buf, sizeof (buf), "-inf");
- } else {
- snprintf (buf, sizeof (buf), "%.2f", accurate_coefficient_to_dB (val));
- }
-
- _db_display.set_text (buf);
- }
+ if (p == "playback-buffer-seconds") {
+ _playback_adjustment.set_value (_rc_config->get_audio_playback_buffer_seconds());
+ } else if (p == "capture-buffer-seconds") {
+ _capture_adjustment.set_value (_rc_config->get_audio_capture_buffer_seconds());
+ }
}
void set_state_from_config ()
{
- parameter_changed ("solo-mute-gain");
+ parameter_changed ("playback-buffer-seconds");
+ parameter_changed ("capture-buffer-seconds");
}
private:
- void db_changed ()
+ void playback_changed ()
+ {
+ _rc_config->set_audio_playback_buffer_seconds ((long) _playback_adjustment.get_value());
+ }
+
+ void capture_changed ()
{
- _rc_config->set_solo_mute_gain (slider_position_to_gain (_db_adjustment.get_value()));
+ _rc_config->set_audio_capture_buffer_seconds ((long) _capture_adjustment.get_value());
}
RCConfiguration* _rc_config;
- Adjustment _db_adjustment;
- Gtkmm2ext::HSliderController* _db_slider;
- Glib::RefPtr<Gdk::Pixbuf> pix;
- Entry _db_display;
+ Adjustment _playback_adjustment;
+ Adjustment _capture_adjustment;
+ HScale _playback_slider;
+ HScale _capture_slider;
};
-
class ControlSurfacesOptions : public OptionEditorBox
{
public:
- ControlSurfacesOptions ()
+ ControlSurfacesOptions (ArdourDialog& parent)
+ : _parent (parent)
{
_store = ListStore::create (_model);
_view.set_model (_store);
_box->pack_start (_view, false, false);
+ Label* label = manage (new Label);
+ label->set_markup (string_compose (X_("<i>%1</i>"), _("Double-click on a name to edit settings for an enabled protocol")));
+
+ _box->pack_start (*label, false, false);
+ label->show ();
+
_store->signal_row_changed().connect (sigc::mem_fun (*this, &ControlSurfacesOptions::model_changed));
+ _view.signal_button_press_event().connect_notify (sigc::mem_fun(*this, &ControlSurfacesOptions::edit_clicked));
}
void parameter_changed (std::string const &)
}
}
+ void edit_clicked (GdkEventButton* ev)
+ {
+ if (ev->type != GDK_2BUTTON_PRESS) {
+ return;
+ }
+
+ std::string name;
+ ControlProtocolInfo* cpi;
+ TreeModel::Row row;
+
+ row = *(_view.get_selection()->get_selected());
+
+ Window* win = row[_model.editor];
+ if (win && !win->is_visible()) {
+ win->present ();
+ } else {
+ cpi = row[_model.protocol_info];
+
+ if (cpi && cpi->protocol && cpi->protocol->has_editor ()) {
+ 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);
+ box->show ();
+ win->present ();
+ row[_model.editor] = win;
+ }
+ }
+ }
+ }
+
class ControlSurfacesModelColumns : public TreeModelColumnRecord
{
public:
add (enabled);
add (feedback);
add (protocol_info);
+ add (editor);
}
TreeModelColumn<string> name;
TreeModelColumn<bool> enabled;
TreeModelColumn<bool> feedback;
TreeModelColumn<ControlProtocolInfo*> protocol_info;
+ TreeModelColumn<Gtk::Window*> editor;
};
Glib::RefPtr<ListStore> _store;
ControlSurfacesModelColumns _model;
TreeView _view;
+ Gtk::Window& _parent;
};
RCOptionEditor::RCOptionEditor ()
- : OptionEditor (Config, _("Ardour Preferences")),
- _rc_config (Config)
+ : OptionEditor (Config, string_compose (_("%1 Preferences"), PROGRAM_NAME))
+ , _rc_config (Config)
{
/* MISC */
+ uint32_t hwcpus = hardware_concurrency ();
+
+ if (hwcpus > 1) {
+ add_option (_("Misc"), new OptionEditorHeading (_("DSP CPU Utilization")));
+
+ ComboOption<uint32_t>* procs = new ComboOption<uint32_t> (
+ "processor-usage",
+ _("Signal processing uses"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_processor_usage),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_processor_usage)
+ );
+
+ procs->add (-1, _("all but one processor"));
+ procs->add (0, _("all available processors"));
+
+ for (uint32_t i = 2; i < hwcpus; ++i) {
+ procs->add (1, string_compose (_("%1 processors"), i));
+ }
+
+ add_option (_("Misc"), procs);
+ }
+
add_option (_("Misc"), new OptionEditorHeading (_("Metering")));
ComboOption<float>* mht = new ComboOption<float> (
sigc::mem_fun (*_rc_config, &RCConfiguration::set_name_new_markers)
));
+ add_option (_("Misc"), new OptionEditorHeading (_("Click")));
+
+ add_option (_("Misc"), new ClickOptions (_rc_config, this));
+
/* TRANSPORT */
add_option (_("Transport"),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_disable_disarm_during_roll)
));
+ add_option (_("Transport"),
+ 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)
+ ));
+
/* EDITOR */
add_option (_("Editor"),
add_option (_("Editor"), wfsh);
- /* AUDIO */
-
- add_option (_("Audio"), new OptionEditorHeading (_("Solo")));
-
-
- add_option (_("Audio"),
+ add_option (_("Editor"),
new BoolOption (
- "solo-control-is-listen-control",
- _("Solo controls are Listen controls"),
- sigc::mem_fun (*_rc_config, &RCConfiguration::get_solo_control_is_listen_control),
- sigc::mem_fun (*_rc_config, &RCConfiguration::set_solo_control_is_listen_control)
+ "show-waveforms-while-recording",
+ _("Show waveforms for audio while it is being recorded"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_show_waveforms_while_recording),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_waveforms_while_recording)
));
- ComboOption<ListenPosition>* lp = new ComboOption<ListenPosition> (
- "listen-position",
- _("Listen Position"),
- sigc::mem_fun (*_rc_config, &RCConfiguration::get_listen_position),
- sigc::mem_fun (*_rc_config, &RCConfiguration::set_listen_position)
- );
-
- lp->add (AfterFaderListen, _("after-fader listen"));
- lp->add (PreFaderListen, _("pre-fader listen"));
+ /* AUDIO */
- add_option (_("Audio"), lp);
- add_option (_("Audio"), new SoloMuteOptions (_rc_config));
+ add_option (_("Audio"), new OptionEditorHeading (_("Buffering")));
- add_option (_("Audio"),
- new BoolOption (
- "solo-latched",
- _("Latched solo"),
- sigc::mem_fun (*_rc_config, &RCConfiguration::get_solo_latched),
- sigc::mem_fun (*_rc_config, &RCConfiguration::set_solo_latched)
- ));
+ add_option (_("Audio"), new BufferingOptions (_rc_config));
- add_option (_("Audio"),
- new BoolOption (
- "show-solo-mutes",
- _("Show solo muting"),
- sigc::mem_fun (*_rc_config, &RCConfiguration::get_show_solo_mutes),
- sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_solo_mutes)
- ));
+ add_option (_("Audio"), new OptionEditorHeading (_("Monitoring")));
add_option (_("Audio"),
new BoolOption (
- "solo-mute-override",
- _("Override muting"),
- sigc::mem_fun (*_rc_config, &RCConfiguration::get_solo_mute_override),
- sigc::mem_fun (*_rc_config, &RCConfiguration::set_solo_mute_override)
+ "use-monitor-bus",
+ _("Use a monitor bus (allows AFL/PFL and more control)"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_monitor_bus),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_monitor_bus)
));
- add_option (_("Audio"), new OptionEditorHeading (_("Monitoring")));
-
ComboOption<MonitorModel>* mm = new ComboOption<MonitorModel> (
"monitoring-model",
_("Monitoring handled by"),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_monitoring_model)
);
- mm->add (HardwareMonitoring, _("JACK"));
+#ifndef __APPLE__
+ /* no JACK monitoring on CoreAudio */
+ if (AudioEngine::instance()->can_request_hardware_monitoring()) {
+ mm->add (HardwareMonitoring, _("JACK"));
+ }
+#endif
mm->add (SoftwareMonitoring, _("ardour"));
mm->add (ExternalMonitoring, _("audio hardware"));
ComboOption<AutoConnectOption>* iac = new ComboOption<AutoConnectOption> (
"input-auto-connect",
- _("Connect track and bus inputs"),
+ _("Connect track inputs"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_input_auto_connect),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_input_auto_connect)
);
);
oac->add (AutoConnectPhysical, _("automatically to physical outputs"));
- oac->add (AutoConnectMaster, _("automatically to master outputs"));
+ oac->add (AutoConnectMaster, _("automatically to master bus"));
oac->add (ManualConnect, _("manually"));
add_option (_("Audio"), oac);
sigc::mem_fun (*_rc_config, &RCConfiguration::set_auto_analyse_audio)
));
- /* MIDI CONTROL */
-
- list<ComboOption<string>* > midi_combos;
-
- midi_combos.push_back (new ComboOption<string> (
- "mtc-port-name",
- _("Send/Receive MTC via"),
- sigc::mem_fun (*_rc_config, &RCConfiguration::get_mtc_port_name),
- sigc::mem_fun (*_rc_config, &RCConfiguration::set_mtc_port_name)
- ));
-
- midi_combos.push_back (new ComboOption<string> (
- "midi-clock-port-name",
- _("Send/Receive MIDI clock via"),
- sigc::mem_fun (*_rc_config, &RCConfiguration::get_midi_clock_port_name),
- sigc::mem_fun (*_rc_config, &RCConfiguration::set_midi_clock_port_name)
- ));
-
- midi_combos.push_back (new ComboOption<string> (
- "mmc-port-name",
- _("Send/Receive MMC via"),
- sigc::mem_fun (*_rc_config, &RCConfiguration::get_mmc_port_name),
- sigc::mem_fun (*_rc_config, &RCConfiguration::set_mmc_port_name)
- ));
-
- midi_combos.push_back (new ComboOption<string> (
- "midi-port-name",
- _("Send/Receive MIDI parameter control via"),
- sigc::mem_fun (*_rc_config, &RCConfiguration::get_midi_port_name),
- sigc::mem_fun (*_rc_config, &RCConfiguration::set_midi_port_name)
- ));
+ /* SOLO AND MUTE */
+
+ add_option (_("Solo / mute"),
+ new FaderOption (
+ "solo-mute-gain",
+ _("Solo mute cut (dB)"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_solo_mute_gain),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_solo_mute_gain)
+ ));
+
+ add_option (_("Solo / mute"),
+ new BoolOption (
+ "solo-control-is-listen-control",
+ _("Solo controls are Listen controls"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_solo_control_is_listen_control),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_solo_control_is_listen_control)
+ ));
+
+ ComboOption<ListenPosition>* lp = new ComboOption<ListenPosition> (
+ "listen-position",
+ _("Listen Position"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_listen_position),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_listen_position)
+ );
+
+ lp->add (AfterFaderListen, _("after-fader listen"));
+ lp->add (PreFaderListen, _("pre-fader listen"));
+
+ add_option (_("Solo / mute"), lp);
+
+ add_option (_("Solo / mute"),
+ new BoolOption (
+ "exclusive-solo",
+ _("Exclusive solo"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_exclusive_solo),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_exclusive_solo)
+ ));
+
+ add_option (_("Solo / mute"),
+ new BoolOption (
+ "show-solo-mutes",
+ _("Show solo muting"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_show_solo_mutes),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_solo_mutes)
+ ));
+
+ add_option (_("Solo / mute"),
+ new BoolOption (
+ "solo-mute-override",
+ _("Soloing overrides muting"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_solo_mute_override),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_solo_mute_override)
+ ));
+
+ add_option (_("Solo / mute"), new OptionEditorHeading (_("Default track / bus muting options")));
- add_option (_("MIDI control"), new MIDIPorts (_rc_config, midi_combos));
+ add_option (_("Solo / mute"),
+ new BoolOption (
+ "mute-affects-pre-fader",
+ _("Mute affects pre-fader sends"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_mute_affects_pre_fader),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_mute_affects_pre_fader)
+ ));
- for (list<ComboOption<string>* >::iterator i = midi_combos.begin(); i != midi_combos.end(); ++i) {
- add_option (_("MIDI control"), *i);
- }
+ add_option (_("Solo / mute"),
+ new BoolOption (
+ "mute-affects-post-fader",
+ _("Mute affects post-fader sends"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_mute_affects_post_fader),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_mute_affects_post_fader)
+ ));
+
+ add_option (_("Solo / mute"),
+ new BoolOption (
+ "mute-affects-control-outs",
+ _("Mute affects control outputs"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_mute_affects_control_outs),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_mute_affects_control_outs)
+ ));
+
+ add_option (_("Solo / mute"),
+ new BoolOption (
+ "mute-affects-main-outs",
+ _("Mute affects main outputs"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_mute_affects_main_outs),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_mute_affects_main_outs)
+ ));
+
+ add_option (_("MIDI control"),
+ new BoolOption (
+ "send-midi-clock",
+ _("Send MIDI Clock"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_send_midi_clock),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_send_midi_clock)
+ ));
+
+ add_option (_("MIDI control"),
+ new BoolOption (
+ "send-mtc",
+ _("Send MIDI Time Code"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_send_mtc),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_send_mtc)
+ ));
add_option (_("MIDI control"),
new BoolOption (
/* CONTROL SURFACES */
- add_option (_("Control surfaces"), new ControlSurfacesOptions);
+ add_option (_("Control surfaces"), new ControlSurfacesOptions (*this));
ComboOption<RemoteModel>* rm = new ComboOption<RemoteModel> (
"remote-model",
add_option (_("Control surfaces"), rm);
- /* CLICK */
-
- add_option (_("Click"), new ClickOptions (_rc_config, this));
-
/* KEYBOARD */
add_option (_("Keyboard"), new KeyboardOptions);
projects / ardour.git / blobdiff