ardour/livetrax
13
0
Fork 0
Code

Use shared static method to count plugins

Browse Source 
This moves MixersStrip::help_count_plugins to RouteUI,
so that it can be shared with other Strip implementations.
This commit is contained in:
Robin Gareus 2022-01-01 15:34:47 +01:00
parent 4318d25ec7
commit 0a17d8e66a
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
4 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gtk2_ardour/mixer_strip.cc
View File

@ -123,7 +123,6 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
, output_button (false)
, monitor_section_button (0)
, midi_input_enable_button (0)
, _plugin_insert_cnt (0)
, _tmaster_widget (-1, 16)
, _comment_button (_("Comments"))
, trim_control (ArdourKnob::default_elements, ArdourKnob::Flags (ArdourKnob::Detent | ArdourKnob::ArcToZero))
@ -163,7 +162,6 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
, output_button (false)
, monitor_section_button (0)
, midi_input_enable_button (0)
, _plugin_insert_cnt (0)
, _tmaster_widget (-1, 16)
, _comment_button (_("Comments"))
, trim_control (ArdourKnob::default_elements, ArdourKnob::Flags (ArdourKnob::Detent | ArdourKnob::ArcToZero))
@ -1066,24 +1064,6 @@ MixerStrip::show_passthru_color ()
reset_strip_style ();
}
void
MixerStrip::help_count_plugins (boost::weak_ptr<Processor> p)
{
boost::shared_ptr<Processor> processor (p.lock ());
if (!processor || !processor->display_to_user()) {
return;
}
boost::shared_ptr<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert> (processor);
#ifdef MIXBUS
if (pi && pi->is_channelstrip ()) {
return;
}
#endif
if (pi) {
++_plugin_insert_cnt;
}
}
void
MixerStrip::build_route_ops_menu ()
{
@ -1171,9 +1151,9 @@ MixerStrip::build_route_ops_menu ()
items.push_back (SeparatorElem());
}
_plugin_insert_cnt = 0;
_route->foreach_processor (sigc::mem_fun (*this, &MixerStrip::help_count_plugins));
if (active && _plugin_insert_cnt > 0) {
uint32_t plugin_insert_cnt = 0;
_route->foreach_processor (boost::bind (RouteUI::help_count_plugins, _1, & plugin_insert_cnt));
if (active && plugin_insert_cnt > 0) {
items.push_back (MenuElem (_("Pin Connections..."), sigc::mem_fun (*this, &RouteUI::manage_pins)));
}

3
gtk2_ardour/mixer_strip.h
View File

@ -225,9 +225,6 @@ private:
bool input_active_button_press (GdkEventButton*);
bool input_active_button_release (GdkEventButton*);
void help_count_plugins (boost::weak_ptr<ARDOUR::Processor>);
uint32_t _plugin_insert_cnt;
gint mark_update_safe ();
guint32 mode_switch_in_progress;

17
gtk2_ardour/route_ui.cc
View File

@ -2254,6 +2254,23 @@ RouteUI::route_group() const
return _route->route_group();
}
void
RouteUI::help_count_plugins (boost::weak_ptr<Processor> p, uint32_t* plugin_insert_cnt)
{
boost::shared_ptr<Processor> processor (p.lock ());
if (!processor || !processor->display_to_user()) {
return;
}
boost::shared_ptr<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert> (processor);
#ifdef MIXBUS
if (pi && pi->is_channelstrip ()) {
return;
}
#endif
if (pi) {
++(*plugin_insert_cnt);
}
}
RoutePinWindowProxy::RoutePinWindowProxy(std::string const &name, boost::shared_ptr<ARDOUR::Route> route)
: WM::ProxyBase (name, string())

2
gtk2_ardour/route_ui.h
View File

@ -217,6 +217,8 @@ protected:
static void delete_ioselector (IOSelectorMap&, boost::shared_ptr<ARDOUR::Route>);
static void help_count_plugins (boost::weak_ptr<ARDOUR::Processor> p, uint32_t*);
PBD::ScopedConnectionList route_connections;
bool self_destruct;