void on_show () {
refill ();
- AudioEngine::instance()->PortRegisteredOrUnregistered.connect (port_connection,
+
+ AudioEngine::instance()->PortRegisteredOrUnregistered.connect (connections,
invalidator (*this),
boost::bind (&MidiPortOptions::refill, this),
gui_context());
+ AudioEngine::instance()->MidiPortInfoChanged.connect (connections,
+ invalidator (*this),
+ boost::bind (&MidiPortOptions::refill, this),
+ gui_context());
+ AudioEngine::instance()->MidiSelectionPortsChanged.connect (connections,
+ invalidator (*this),
+ boost::bind (&MidiPortOptions::refill, this),
+ gui_context());
}
void refill () {
+
if (refill_midi_ports (true, midi_input_view)) {
input_label.show ();
} else {
}
private:
- PBD::ScopedConnection port_connection;
+ PBD::ScopedConnectionList connections;
/* MIDI port management */
struct MidiPortColumns : public Gtk::TreeModel::ColumnRecord {
MidiPortColumns () {
add (pretty_name);
- add (in_use);
add (music_data);
add (control_data);
add (selection);
}
Gtk::TreeModelColumn<std::string> pretty_name;
- Gtk::TreeModelColumn<bool> in_use;
Gtk::TreeModelColumn<bool> music_data;
Gtk::TreeModelColumn<bool> control_data;
Gtk::TreeModelColumn<bool> selection;
void setup_midi_port_view (Gtk::TreeView&, bool with_selection);
bool refill_midi_ports (bool for_input, Gtk::TreeView&);
void pretty_name_edit (std::string const & path, std::string const & new_text, Gtk::TreeView*);
- void midi_use_column_toggled (std::string const & path, Gtk::TreeView*);
void midi_music_column_toggled (std::string const & path, Gtk::TreeView*);
void midi_control_column_toggled (std::string const & path, Gtk::TreeView*);
void midi_selection_column_toggled (std::string const & path, Gtk::TreeView*);
MidiPortOptions::setup_midi_port_view (Gtk::TreeView& view, bool with_selection)
{
int pretty_name_column;
- int use_column;
int music_column;
int control_column;
int selection_column;
pretty_name_column = view.append_column_editable (_("Name (click to edit)"), midi_port_columns.pretty_name) - 1;
- col = manage (new TreeViewColumn ("", midi_port_columns.in_use));
- col->set_alignment (ALIGN_CENTER);
- l = manage (new Label (_("Use")));
- set_tooltip (*l, string_compose (_("If ticked, %1 will use this port.\n\nOtherwise, the port will be ignored."), PROGRAM_NAME));
- col->set_widget (*l);
- l->show ();
- use_column = view.append_column (*col) - 1;
-
col = manage (new TreeViewColumn ("", midi_port_columns.music_data));
col->set_alignment (ALIGN_CENTER);
l = manage (new Label (_("Music Data")));
CellRendererToggle* toggle_cell;
- toggle_cell = dynamic_cast<CellRendererToggle*> (view.get_column_cell_renderer (use_column));
- toggle_cell->property_activatable() = true;
- toggle_cell->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &MidiPortOptions::midi_use_column_toggled), &view));
-
toggle_cell = dynamic_cast<CellRendererToggle*> (view.get_column_cell_renderer (music_column));
toggle_cell->property_activatable() = true;
toggle_cell->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &MidiPortOptions::midi_music_column_toggled), &view));
}
view.get_selection()->set_mode (SELECTION_NONE);
- view.set_tooltip_column (5); /* port "real" name */
+ view.set_tooltip_column (4); /* port "real" name */
}
bool
std::vector<string> ports;
- AudioEngine::instance()->get_ports (string(), DataType::MIDI, for_input ? IsOutput : IsInput, ports);
+ AudioEngine::instance()->get_known_midi_ports (ports);
if (ports.empty()) {
view.hide ();
continue;
}
+ PortManager::MidiPortInformation mpi (AudioEngine::instance()->midi_port_information (*s));
+
+ if (mpi.pretty_name.empty()) {
+ /* vanished since get_known_midi_ports() */
+ continue;
+ }
+
+ if (for_input != mpi.input) {
+ continue;
+ }
+
TreeModel::Row row = *(model->append());
- string pretty = AudioEngine::instance()->get_pretty_name_by_name (*s);
- row[midi_port_columns.pretty_name] = (pretty.empty() ? *s : pretty);
- row[midi_port_columns.in_use] = true;
- row[midi_port_columns.music_data] = true;
- row[midi_port_columns.control_data] = true;
+ row[midi_port_columns.pretty_name] = mpi.pretty_name;
+ row[midi_port_columns.music_data] = mpi.properties & MidiPortMusic;
+ row[midi_port_columns.control_data] = mpi.properties & MidiPortControl;
+ row[midi_port_columns.selection] = mpi.properties & MidiPortSelection;
row[midi_port_columns.name] = *s;
}
view.set_model (model);
+
return true;
}
void
-MidiPortOptions::midi_use_column_toggled (string const & path, TreeView* view)
+MidiPortOptions::midi_music_column_toggled (string const & path, TreeView* view)
{
TreeIter iter = view->get_model()->get_iter (path);
return;
}
- bool value ((*iter)[midi_port_columns.in_use]);
- (*iter)[midi_port_columns.in_use] = !value;
+ bool new_value = ! bool ((*iter)[midi_port_columns.music_data]);
-}
+ /* don't reset model - wait for MidiPortInfoChanged signal */
-void
-MidiPortOptions::midi_music_column_toggled (string const & path, TreeView* view)
-{
- TreeIter iter = view->get_model()->get_iter (path);
-
- if (!iter) {
- return;
+ if (new_value) {
+ ARDOUR::AudioEngine::instance()->add_midi_port_flags ((*iter)[midi_port_columns.name], MidiPortMusic);
+ } else {
+ ARDOUR::AudioEngine::instance()->remove_midi_port_flags ((*iter)[midi_port_columns.name], MidiPortMusic);
}
-
- bool value ((*iter)[midi_port_columns.music_data]);
- (*iter)[midi_port_columns.music_data] = !value;
}
void
return;
}
- bool value ((*iter)[midi_port_columns.control_data]);
- (*iter)[midi_port_columns.control_data] = !value;
+ bool new_value = ! bool ((*iter)[midi_port_columns.control_data]);
+
+ /* don't reset model - wait for MidiPortInfoChanged signal */
- if (!value) {
- // ARDOUR::AudioEngine::instance()->remove_port_purpose (PortFlags (ControlData));
+ if (new_value) {
+ ARDOUR::AudioEngine::instance()->add_midi_port_flags ((*iter)[midi_port_columns.name], MidiPortControl);
} else {
- // ARDOUR::AudioEngine::instance()->add_port_purpose (PortFlags (ControlData));
+ ARDOUR::AudioEngine::instance()->remove_midi_port_flags ((*iter)[midi_port_columns.name], MidiPortControl);
}
}
if (!iter) {
return;
}
- bool value ((*iter)[midi_port_columns.selection]);
- (*iter)[midi_port_columns.selection] = !value;
- if (!value) {
- ARDOUR::AudioEngine::instance()->add_to_midi_selection_ports ((*iter)[midi_port_columns.name]);
+ bool new_value = ! bool ((*iter)[midi_port_columns.selection]);
+
+ /* don't reset model - wait for MidiSelectionPortsChanged signal */
+
+ if (new_value) {
+ ARDOUR::AudioEngine::instance()->add_midi_port_flags ((*iter)[midi_port_columns.name], MidiPortSelection);
} else {
- ARDOUR::AudioEngine::instance()->remove_from_midi_selection_ports ((*iter)[midi_port_columns.name]);
+ ARDOUR::AudioEngine::instance()->remove_midi_port_flags ((*iter)[midi_port_columns.name], MidiPortSelection);
}
}
));
} // !mixbus
+ add_option (_("Editor"),
+ new BoolOption (
+ "use-time-rulers-to-zoom-with-vertical-drag",
+ _("Use time rulers area to zoom when clicking and dragging vertically"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_time_rulers_to_zoom_with_vertical_drag),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_time_rulers_to_zoom_with_vertical_drag)
+ ));
+
add_option (_("Editor"),
new BoolOption (
"update-editor-during-summary-drag",
/* VIDEO Timeline */
add_option (_("Video"), new VideoTimelineOptions (_rc_config));
-#if (defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined AUDIOUNIT_SUPPORT)
+#if (defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined MACVST_SUPPORT || defined AUDIOUNIT_SUPPORT)
add_option (_("Plugins"),
new RcActionButton (_("Scan for Plugins"),
sigc::mem_fun (*this, &RCOptionEditor::plugin_scan_refresh)));
add_option (_("Plugins"), new OptionEditorHeading (_("General")));
-#if (defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined AUDIOUNIT_SUPPORT)
+#if (defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined MACVST_SUPPORT || defined AUDIOUNIT_SUPPORT)
bo = new BoolOption (
"show-plugin-scan-window",
_("Always Display Plugin Scan Progress"),
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"));
-#if (defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT)
+#if (defined WINDOWS_VST_SUPPORT || defined MACVST_SUPPORT || defined LXVST_SUPPORT)
add_option (_("Plugins/VST"), new OptionEditorHeading (_("VST")));
add_option (_("Plugins/VST"),
new RcActionButton (_("Scan for Plugins"),
sigc::mem_fun (*this, &RCOptionEditor::plugin_scan_refresh)));
+#if (defined AUDIOUNIT_SUPPORT && defined MACVST_SUPPORT)
+ bo = new BoolOption (
+ "",
+ _("Enable Mac VST support (requires restart or re-scan)"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_macvst),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_macvst)
+ );
+ add_option (_("Plugins/VST"), bo);
+#endif
+
bo = new BoolOption (
"discover-vst-on-start",
_("Scan for [new] VST Plugins on Application Start"),
bo = new BoolOption (
"discover-audio-units",
- _("Scan for AudioUnit Plugins on Application Start"),
+ _("Scan for [new] AudioUnit Plugins on Application Start"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_discover_audio_units),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_discover_audio_units)
);
- add_option (_("Plugins"), bo);
+ add_option (_("Plugins/Audio Unit"), bo);
Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
_("<b>When enabled</b> Audio Unit Plugins are discovered on application start. When disabled AU plugins will only be available after triggering a 'Scan' manually. The first successful scan will enable AU auto-scan, Any crash during plugin discovery will disable it."));
_("AU Blacklist:")));
#endif
-#if (defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined AUDIOUNIT_SUPPORT || defined HAVE_LV2)
+#if (defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined MACVST_SUPPORT || defined AUDIOUNIT_SUPPORT || defined HAVE_LV2)
add_option (_("Plugins"), new OptionEditorHeading (_("Plugin GUI")));
add_option (_("Plugins"),
new BoolOption (
add_option (_("Theme/Colors"), new ColorThemeManager);
+ Widget::show_all ();
+
//trigger some parameter-changed messages which affect widget-visibility or -sensitivity
parameter_changed ("send-ltc");
parameter_changed ("sync-source");
projects / ardour.git / blobdiff