ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

NO-OP: cleanup and remove debug messages

Browse Source
This commit is contained in:
Robin Gareus 2020-04-03 14:39:03 +02:00
parent 35aab65d59
commit 11f28a4b1d
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
gtk2_ardour/midi_time_axis.cc
View File

@ -264,7 +264,6 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt)
_midi_controls_box.set_homogeneous(false);
_midi_controls_box.set_border_width (2);
/* this directly calls use_midnam_info() if there are midnam's already */
MIDI::Name::MidiPatchManager::instance().maybe_use (*this, invalidator (*this), boost::bind (&MidiTimeAxisView::use_midnam_info, this), gui_context());
@ -307,13 +306,6 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt)
}
}
void
MidiTimeAxisView::processors_changed (RouteProcessorChange c)
{
RouteTimeAxisView::processors_changed (c);
maybe_trigger_model_change ();
}
void
MidiTimeAxisView::first_idle ()
{
@ -343,12 +335,37 @@ MidiTimeAxisView::check_step_edit ()
_step_editor->check_step_edit ();
}
void
MidiTimeAxisView::processors_changed (RouteProcessorChange c)
{
RouteTimeAxisView::processors_changed (c);
maybe_trigger_model_change ();
}
void
MidiTimeAxisView::use_midnam_info ()
{
setup_midnam_patches ();
}
void
MidiTimeAxisView::maybe_trigger_model_change ()
{
if (_route->instrument_info().have_custom_plugin_info ()) {
/* ensure that "Plugin Provided" is at the top of the list */
if (_midnam_model_selector.items().empty () || _midnam_model_selector.items().begin()->get_label() != _("Plugin Provided")) {
/* setup_midnam_patches unconditionally calls model_changed() */
setup_midnam_patches ();
}
} else {
/* no plugin provided MIDNAM for this plugin */
if (!_midnam_model_selector.items().empty () && _midnam_model_selector.items().begin()->get_label() == _("Plugin Provided")) {
/* setup_midnam_patches unconditionally calls model_changed() */
setup_midnam_patches ();
}
}
}
void
MidiTimeAxisView::setup_midnam_patches ()
{
@ -366,7 +383,7 @@ MidiTimeAxisView::setup_midnam_patches ()
Menu* menu = Gtk::manage(new Menu);
Menu_Helpers::MenuList& items = menu->items();
// Build manufacturer submenu
/* Build manufacturer submenu */
for (MIDI::Name::MIDINameDocument::MasterDeviceNamesList::const_iterator n = m->second.begin(); n != m->second.end(); ++n) {
if (patch_manager.is_custom_model (n->first)) {
@ -385,7 +402,7 @@ MidiTimeAxisView::setup_midnam_patches ()
continue;
}
// Add manufacturer submenu to selector
/* Add manufacturer submenu to selector */
_midnam_model_selector.AddMenuElem(Menu_Helpers::MenuElem(m->first, *menu));
}
@ -414,22 +431,6 @@ MidiTimeAxisView::setup_midnam_patches ()
}
}
void
MidiTimeAxisView::maybe_trigger_model_change ()
{
bool changed = false;
if (_route->instrument_info().have_custom_plugin_info ()) {
if (_midnam_model_selector.items().empty () || _midnam_model_selector.items().begin()->get_label() != _("Plugin Provided")) {
setup_midnam_patches ();
}
} else {
/* no plugin provided MIDNAM for this plugin */
if (!_midnam_model_selector.items().empty () && _midnam_model_selector.items().begin()->get_label() == _("Plugin Provided")) {
setup_midnam_patches ();
}
}
}
void
MidiTimeAxisView::model_changed (const std::string& m)
{
@ -485,9 +486,9 @@ MidiTimeAxisView::model_changed (const std::string& m)
/* set backend state */
_route->instrument_info().set_external_instrument (model, mode);
/* query effective model/mode -- may be plugin provided */
if (_effective_model == _route->instrument_info().model () && _effective_mode == _route->instrument_info().mode ()) {
/* no change */
printf (" ---- SKIP ----\n");
return;
}