Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

osc: Send /select/plugin plugin_id feedback #897

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

osc: Send /select/plugin plugin_id feedback #897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f375e81
osc: Update sur->plugins whenever strip changes
matthijskooijman Jun 30, 2024
8a2a22d
osc: Pass user-visible piid to OSCSelectObserver
matthijskooijman Jun 30, 2024
b786aa7
osc: Send /select/plugin plugin_id feedback
matthijskooijman Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 27 additions & 23 deletions libs/surfaces/osc/osc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2883,32 +2883,12 @@ OSC::_sel_plugin (int id, lo_address addr)
return 1;
}

/* find out how many plugins we have */
sur->plugins.clear();
for (int nplugs = 0; true; ++nplugs) {
std::shared_ptr<Processor> proc = r->nth_plugin (nplugs);
if (!proc) {
break;
}
if (!r->nth_plugin(nplugs)->display_to_user()) {
continue;
}
#ifdef MIXBUS
/* need to check for mixbus channel strips (and exclude them) */
std::shared_ptr<PluginInsert> pi = std::dynamic_pointer_cast<PluginInsert>(proc);
if (pi && pi->is_channelstrip()) {
continue;
}
#endif
sur->plugins.push_back (nplugs);
}

// limit plugin_id to actual plugins
if (sur->plugins.size() < 1) {
sur->plugin_id = 0;
sur->plug_page = 1;
if (sur->sel_obs) {
sur->sel_obs->set_plugin_id(-1, 1);
sur->sel_obs->set_plugin_id(0, 1);
}
return 0;
} else if (id < 1) {
Expand Down Expand Up @@ -2944,7 +2924,7 @@ OSC::_sel_plugin (int id, lo_address addr)
sur->plug_page = 1;

if (sur->sel_obs) {
sur->sel_obs->set_plugin_id(sur->plugins[sur->plugin_id - 1], sur->plug_page);
sur->sel_obs->set_plugin_id(sur->plugin_id, sur->plug_page);
}
return 0;
}
Expand Down Expand Up @@ -4760,11 +4740,36 @@ OSC::_strip_select2 (std::shared_ptr<Stripable> s, OSCSurface *sur, lo_address a
_select = s;
}
if (!s) {
sur->plugins.clear();
return 0;
}
if (s != old_sel) {
sur->select = s;
}

/* Create list of user-visible plugins (into which piid indexes) */
sur->plugins.clear();
std::shared_ptr<Route> r = std::dynamic_pointer_cast<Route>(s);
if (r) {
for (int nplugs = 0; true; ++nplugs) {
std::shared_ptr<Processor> proc = r->nth_plugin (nplugs);
if (!proc) {
break;
}
if (!r->nth_plugin(nplugs)->display_to_user()) {
continue;
}
#ifdef MIXBUS
/* need to check for mixbus channel strips (and exclude them) */
std::shared_ptr<PluginInsert> pi = std::dynamic_pointer_cast<PluginInsert>(proc);
if (pi && pi->is_channelstrip()) {
continue;
}
#endif
sur->plugins.push_back (nplugs);
}
}

bool sends;
uint32_t nsends = 0;
do {
Expand Down Expand Up @@ -4807,7 +4812,6 @@ OSC::_strip_select2 (std::shared_ptr<Stripable> s, OSCSurface *sur, lo_address a
}
// need to set monitor for processor changed signal (for paging)
string address = lo_address_get_url (addr);
std::shared_ptr<Route> r = std::dynamic_pointer_cast<Route>(s);
if (r) {
r->processors_changed.connect (sur->proc_connection, MISSING_INVALIDATOR, boost::bind (&OSC::processor_changed, this, address), this);
_sel_plugin (sur->plugin_id, addr);
Expand Down
13 changes: 8 additions & 5 deletions libs/surfaces/osc/osc_select_observer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ OSCSelectObserver::OSCSelectObserver (OSC& o, ARDOUR::Session& s, ArdourSurface:
plug_size = plug_page_size;
plug_page = sur->plug_page;
if (sur->plugins.size () > 0) {
plug_id = sur->plugins[sur->plugin_id - 1];
selected_piid = sur->plugin_id;
} else {
plug_id = -1;
selected_piid = 0;
}
_group_sharing[15] = 1;
refresh_strip (sur->select, sur->nsends, gainmode, true);
Expand Down Expand Up @@ -441,7 +441,7 @@ OSCSelectObserver::send_end ()
void
OSCSelectObserver::set_plugin_id (int id, uint32_t page)
{
plug_id = id;
selected_piid = id;
plug_page = page;
renew_plugin ();
}
Expand Down Expand Up @@ -469,7 +469,7 @@ OSCSelectObserver::renew_plugin () {
void
OSCSelectObserver::plugin_init()
{
if (plug_id < 0) {
if (!selected_piid) {
plugin_end ();
return;
}
Expand All @@ -480,12 +480,14 @@ OSCSelectObserver::plugin_init()
}

// we have a plugin number now get the processor
std::shared_ptr<Processor> proc = r->nth_plugin (plug_id);
std::shared_ptr<Processor> proc = r->nth_plugin (sur->plugins[selected_piid - 1]);
std::shared_ptr<PluginInsert> pi;
if (!(pi = std::dynamic_pointer_cast<PluginInsert>(proc))) {
plugin_end ();
return;
}
_osc.float_message (X_("/select/plugin"), selected_piid, addr);

std::shared_ptr<ARDOUR::Plugin> pip = pi->plugin();
// we have a plugin we can ask if it is activated
proc->ActiveChanged.connect (plugin_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::plug_enable, this, X_("/select/plugin/activate"), proc), OSC::instance());
Expand Down Expand Up @@ -558,6 +560,7 @@ void
OSCSelectObserver::plugin_end ()
{
plugin_connections.drop_connections ();
_osc.float_message (X_("/select/plugin"), 0, addr);
_osc.float_message (X_("/select/plugin/activate"), 0, addr);
_osc.text_message (X_("/select/plugin/name"), " ", addr);
for (uint32_t i = 1; i <= plug_size; i++) {
Expand Down
2 changes: 1 addition & 1 deletion libs/surfaces/osc/osc_select_observer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class OSCSelectObserver
uint32_t nplug_params;
uint32_t plug_page_size;
uint32_t plug_page;
int plug_id;
uint32_t selected_piid;
uint32_t plug_size;
std::vector<int> plug_params;
int eq_bands;
Expand Down