+/*
+ Copyright (C) 2001-2011 Paul Davis
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifdef WAF_BUILD
+#include "gtk2ardour-config.h"
+#endif
+
#include <gtkmm/liststore.h>
#include <gtkmm/stock.h>
#include <gtkmm/scale.h>
#include "pbd/cpus.h"
#include "midi++/manager.h"
-#include "midi++/factory.h"
#include "ardour/audioengine.h"
#include "ardour/dB.h"
#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"
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:
-
- typedef std::map<MIDI::Port*,MidiTracer*> PortTraceMap;
- PortTraceMap port_input_trace_map;
- PortTraceMap port_output_trace_map;
-
- 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()) {
- PortTraceMap::iterator x = port_input_trace_map.find (port);
- MidiTracer* mt;
-
- if (x == port_input_trace_map.end()) {
- mt = new MidiTracer (port->name() + string (" [input]"), *port->input());
- port_input_trace_map.insert (pair<MIDI::Port*,MidiTracer*> (port, mt));
- } else {
- mt = x->second;
- }
- mt->present ();
- }
- }
-
- if (port->output()) {
-
- if (r[_model.trace_output] != port->output()->tracing()) {
- PortTraceMap::iterator x = port_output_trace_map.find (port);
- MidiTracer* mt;
-
- if (x == port_output_trace_map.end()) {
- mt = new MidiTracer (port->name() + string (" [output]"), *port->output());
- port_output_trace_map.insert (pair<MIDI::Port*,MidiTracer*> (port, mt));
- } else {
- mt = x->second;
- }
- mt->present ();
- }
-
- }
- }
-
- 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, MISSING_INVALIDATOR, boost::bind (&MIDIPorts::port_offline_changed, this, (*i)), gui_context());
- 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:
- 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;
};
_delete_button_adjustment (3, 1, 12),
_delete_button_spin (_delete_button_adjustment),
_edit_button_adjustment (3, 1, 5),
- _edit_button_spin (_edit_button_adjustment)
-
+ _edit_button_spin (_edit_button_adjustment),
+ _insert_note_button_adjustment (3, 1, 5),
+ _insert_note_button_spin (_insert_note_button_adjustment)
{
/* internationalize and prepare for use with combos */
_delete_button_adjustment.set_value (Keyboard::delete_button());
_delete_button_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::delete_button_changed));
+
+ set_popdown_strings (_insert_note_modifier_combo, dumb);
+ _insert_note_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::insert_note_modifier_chosen));
+
+ 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));
+ break;
+ }
+ }
+
+ l = manage (new 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);
+
+ l = manage (new Label (_("+ button")));
+ l->set_name ("OptionsLabel");
+
+ t->attach (*l, 3, 4, 2, 3, FILL | EXPAND, FILL);
+ t->attach (_insert_note_button_spin, 4, 5, 2, 3, FILL | EXPAND, FILL);
+
+ _insert_note_button_spin.set_name ("OptionsEntry");
+ _insert_note_button_adjustment.set_value (Keyboard::insert_note_button());
+ _insert_note_button_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::insert_note_button_changed));
+
+
set_popdown_strings (_snap_modifier_combo, dumb);
_snap_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::snap_modifier_chosen));
l->set_name ("OptionsLabel");
l->set_alignment (0, 0.5);
- t->attach (*l, 0, 1, 2, 3, FILL | EXPAND, FILL);
- t->attach (_snap_modifier_combo, 1, 2, 2, 3, FILL | EXPAND, FILL);
+ t->attach (*l, 0, 1, 3, 4, FILL | EXPAND, FILL);
+ t->attach (_snap_modifier_combo, 1, 2, 3, 4, FILL | EXPAND, FILL);
vector<string> strs;
l->set_name ("OptionsLabel");
l->set_alignment (0, 0.5);
- t->attach (*l, 0, 1, 3, 4, FILL | EXPAND, FILL);
- t->attach (_keyboard_layout_selector, 1, 2, 3, 4, FILL | EXPAND, FILL);
+ t->attach (*l, 0, 1, 4, 5, FILL | EXPAND, FILL);
+ t->attach (_keyboard_layout_selector, 1, 2, 4, 5, FILL | EXPAND, FILL);
_box->pack_start (*t, false, false);
}
}
}
+ void insert_note_modifier_chosen ()
+ {
+ string const txt = _insert_note_modifier_combo.get_active_text();
+
+ for (int i = 0; modifiers[i].name; ++i) {
+ if (txt == _(modifiers[i].name)) {
+ Keyboard::set_insert_note_modifier (modifiers[i].modifier);
+ break;
+ }
+ }
+ }
+
void snap_modifier_chosen ()
{
string const txt = _snap_modifier_combo.get_active_text();
Keyboard::set_edit_button (_edit_button_spin.get_value_as_int());
}
+ void insert_note_button_changed ()
+ {
+ Keyboard::set_insert_note_button (_insert_note_button_spin.get_value_as_int());
+ }
+
ComboBoxText _keyboard_layout_selector;
ComboBoxText _edit_modifier_combo;
ComboBoxText _delete_modifier_combo;
+ ComboBoxText _insert_note_modifier_combo;
ComboBoxText _snap_modifier_combo;
Adjustment _delete_button_adjustment;
SpinButton _delete_button_spin;
Adjustment _edit_button_adjustment;
SpinButton _edit_button_spin;
+ Adjustment _insert_note_button_adjustment;
+ SpinButton _insert_note_button_spin;
+
};
class FontScalingOptions : public OptionEditorBox
class BufferingOptions : public OptionEditorBox
{
public:
- BufferingOptions (RCConfiguration* c)
+ BufferingOptions (RCConfiguration* c)
: _rc_config (c)
, _playback_adjustment (5, 1, 60, 1, 4)
, _capture_adjustment (5, 1, 60, 1, 4)
h->pack_start (_playback_slider, true, true);
_box->pack_start (*h, false, false);
-
+
_capture_adjustment.set_value (_rc_config->get_audio_capture_buffer_seconds());
l = manage (new Label (_("Recording (seconds of buffering):")));
h->pack_start (_capture_slider, true, true);
_box->pack_start (*h, false, false);
-
+
_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));
}
class ControlSurfacesOptions : public OptionEditorBox
{
public:
- ControlSurfacesOptions (ArdourDialog& parent)
+ ControlSurfacesOptions (Gtk::Window& parent)
: _parent (parent)
{
_store = ListStore::create (_model);
_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));
}
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 ();
+ 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);
+ 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 */
if (hwcpus > 1) {
add_option (_("Misc"), new OptionEditorHeading (_("DSP CPU Utilization")));
-
- ComboOption<uint32_t>* procs = new ComboOption<uint32_t> (
+
+ ComboOption<int32_t>* procs = new ComboOption<int32_t> (
"processor-usage",
- _("Signal processing uses: "),
+ _("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"));
- 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> (
- "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);
+ procs->add (-1, _("all but one processor"));
+ procs->add (0, _("all available processors"));
- 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"));
+ for (uint32_t i = 1; i <= hwcpus; ++i) {
+ procs->add (i, string_compose (_("%1 processors"), i));
+ }
- add_option (_("Misc"), mfo);
+ add_option (_("Misc"), procs);
+ }
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",
- _("Syncronise 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")));
-
+
add_option (_("Misc"), new ClickOptions (_rc_config, this));
/* TRANSPORT */
sigc::mem_fun (*_rc_config, &RCConfiguration::set_stop_at_session_end)
));
+ add_option (_("Transport"),
+ 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",
add_option (_("Editor"),
new BoolOption (
"automation-follows-regions",
- _("Move relevant automation when regions are moved"),
+ _("Move relevant automation when audio regions are moved"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_automation_follows_regions),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_automation_follows_regions)
));
sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_waveforms_while_recording)
));
+ add_option (_("Editor"),
+ new BoolOption (
+ "show-zoom-tools",
+ _("Show zoom toolbar"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_show_zoom_tools),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_zoom_tools)
+ ));
+
+ add_option (_("Editor"),
+ new BoolOption (
+ "color-regions-using-track-color",
+ _("Color regions using their track's color"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_color_regions_using_track_color),
+ 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")));
ComboOption<MonitorModel>* mm = new ComboOption<MonitorModel> (
"monitoring-model",
- _("Monitoring handled by"),
+ _("Record monitoring handled by"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_monitoring_model),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_monitoring_model)
);
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);
}
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_auto_analyse_audio)
));
+ add_option (_("Audio"),
+ new BoolOption (
+ "replicate-missing-region-channels",
+ _("Replicate missing region channels"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_replicate_missing_region_channels),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_replicate_missing_region_channels)
+ ));
+
/* SOLO AND MUTE */
add_option (_("Solo / mute"),
new FaderOption (
"solo-mute-gain",
- _("Solo mute cut (dB)"),
+ _("Solo-in-place 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> (
+ _solo_control_is_listen_control = 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)
+ );
+
+ add_option (_("Solo / mute"), _solo_control_is_listen_control);
+
+ _listen_position = 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"));
+ _listen_position->add (AfterFaderListen, _("after-fader (AFL)"));
+ _listen_position->add (PreFaderListen, _("pre-fader (PFL)"));
- add_option (_("Solo / mute"), lp);
+ 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"),
new BoolOption (
));
add_option (_("Solo / mute"), new OptionEditorHeading (_("Default track / bus muting options")));
-
+
add_option (_("Solo / mute"),
new BoolOption (
"mute-affects-pre-fader",
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",
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",
sigc::mem_fun (*_rc_config, &RCConfiguration::set_mute_affects_main_outs)
));
- /* 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)
- ));
-
- add_option (_("MIDI control"), new MIDIPorts (_rc_config, midi_combos));
-
- for (list<ComboOption<string>* >::iterator i = midi_combos.begin(); i != midi_combos.end(); ++i) {
- add_option (_("MIDI control"), *i);
- }
+ add_option (_("MIDI"),
+ 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"),
+ 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"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_mtc_qf_speed_tolerance),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_mtc_qf_speed_tolerance),
+ 0, 20, 1, 5
+ ));
+
+ 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)
+ ));
+
+ /* 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<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 (_("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 (_("Visual|Interface"), mfo);
}
+void
+RCOptionEditor::parameter_changed (string const & p)
+{
+ OptionEditor::parameter_changed (p);
+ if (p == "use-monitor-bus") {
+ bool const s = Config->get_use_monitor_bus ();
+ if (!s) {
+ /* we can't use this if we don't have a monitor bus */
+ Config->set_solo_control_is_listen_control (false);
+ }
+ _solo_control_is_listen_control->set_sensitive (s);
+ _listen_position->set_sensitive (s);
+ }
+}