diff options
Diffstat (limited to 'libs/surfaces/mackie')
-rw-r--r-- | libs/surfaces/mackie/strip.cc | 80 | ||||
-rw-r--r-- | libs/surfaces/mackie/strip.h | 8 |
2 files changed, 0 insertions, 88 deletions
diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc index 33c63e04a3..5826ec3742 100644 --- a/libs/surfaces/mackie/strip.cc +++ b/libs/surfaces/mackie/strip.cc @@ -240,9 +240,6 @@ Strip::set_route (boost::shared_ptr<Route> r, bool /*with_messages*/) /* setup legal VPot modes for this route */ - build_input_list (_route->input()->n_ports()); - build_output_list (_route->output()->n_ports()); - possible_pot_parameters.clear(); if (pannable) { @@ -1079,83 +1076,6 @@ Strip::return_to_vpot_mode_display () } } -struct RouteCompareByName { - bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) { - return a->name().compare (b->name()) < 0; - } -}; - -void -Strip::maybe_add_to_bundle_map (BundleMap& bm, boost::shared_ptr<Bundle> b, bool for_input, const ChanCount& channels) -{ - if (b->ports_are_outputs() == !for_input || b->nchannels() != channels) { - return; - } - - bm[b->name()] = b; -} - -void -Strip::build_input_list (const ChanCount& channels) -{ - boost::shared_ptr<ARDOUR::BundleList> b = _surface->mcp().get_session().bundles (); - - input_bundles.clear (); - - /* give user bundles first chance at being in the menu */ - - for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) { - if (boost::dynamic_pointer_cast<UserBundle> (*i)) { - maybe_add_to_bundle_map (input_bundles, *i, true, channels); - } - } - - for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) { - if (boost::dynamic_pointer_cast<UserBundle> (*i) == 0) { - maybe_add_to_bundle_map (input_bundles, *i, true, channels); - } - } - - boost::shared_ptr<ARDOUR::RouteList> routes = _surface->mcp().get_session().get_routes (); - RouteList copy = *routes; - copy.sort (RouteCompareByName ()); - - for (ARDOUR::RouteList::const_iterator i = copy.begin(); i != copy.end(); ++i) { - maybe_add_to_bundle_map (input_bundles, (*i)->output()->bundle(), true, channels); - } - -} - -void -Strip::build_output_list (const ChanCount& channels) -{ - boost::shared_ptr<ARDOUR::BundleList> b = _surface->mcp().get_session().bundles (); - - output_bundles.clear (); - - /* give user bundles first chance at being in the menu */ - - for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) { - if (boost::dynamic_pointer_cast<UserBundle> (*i)) { - maybe_add_to_bundle_map (output_bundles, *i, false, channels); - } - } - - for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) { - if (boost::dynamic_pointer_cast<UserBundle> (*i) == 0) { - maybe_add_to_bundle_map (output_bundles, *i, false, channels); - } - } - - boost::shared_ptr<ARDOUR::RouteList> routes = _surface->mcp().get_session().get_routes (); - RouteList copy = *routes; - copy.sort (RouteCompareByName ()); - - for (ARDOUR::RouteList::const_iterator i = copy.begin(); i != copy.end(); ++i) { - maybe_add_to_bundle_map (output_bundles, (*i)->input()->bundle(), false, channels); - } -} - void Strip::next_pot_mode () { diff --git a/libs/surfaces/mackie/strip.h b/libs/surfaces/mackie/strip.h index d810a98d30..e06eccf25f 100644 --- a/libs/surfaces/mackie/strip.h +++ b/libs/surfaces/mackie/strip.h @@ -144,14 +144,6 @@ private: void do_parameter_display (ARDOUR::AutomationType, float val); void queue_parameter_display (ARDOUR::AutomationType, float val); - typedef std::map<std::string,boost::shared_ptr<ARDOUR::Bundle> > BundleMap; - BundleMap input_bundles; - BundleMap output_bundles; - - void build_input_list (const ARDOUR::ChanCount&); - void build_output_list (const ARDOUR::ChanCount&); - void maybe_add_to_bundle_map (BundleMap& bm, boost::shared_ptr<ARDOUR::Bundle>, bool for_input, const ARDOUR::ChanCount&); - void select_event (Button&, ButtonState); void vselect_event (Button&, ButtonState); void fader_touch_event (Button&, ButtonState); |