allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

OSC: We want to see aux buses even if the gui has them hidden

Browse Source
This commit is contained in:
Len Ovens
2017-01-11 19:57:19 -08:00
parent 90202f7675
commit c9715af5d9
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/surfaces/osc/osc.cc
View File

@@ -1386,7 +1386,8 @@ OSC::get_surface (lo_address addr)
s.sel_obs = 0; s.sel_obs = 0;
s.expand = 0; s.expand = 0;
s.expand_enable = false; s.expand_enable = false;
s.strips = get_sorted_stripables(s.strip_types); s.cue = false;
s.strips = get_sorted_stripables(s.strip_types, s.cue);
s.nstrips = s.strips.size(); s.nstrips = s.strips.size();
_surface.push_back (s); _surface.push_back (s);
@@ -1514,7 +1515,7 @@ OSC::_set_bank (uint32_t bank_start, lo_address addr)
usleep ((uint32_t) 10); usleep ((uint32_t) 10);
} }
s->strips = get_sorted_stripables(s->strip_types); s->strips = get_sorted_stripables(s->strip_types, s->cue);
s->nstrips = s->strips.size(); s->nstrips = s->strips.size();
uint32_t b_size; uint32_t b_size;
@@ -3667,7 +3668,7 @@ OSC::set_state (const XMLNode& node, int version)
s.sel_obs = 0; s.sel_obs = 0;
s.expand = 0; s.expand = 0;
s.expand_enable = false; s.expand_enable = false;
s.strips = get_sorted_stripables(s.strip_types); s.strips = get_sorted_stripables(s.strip_types, s.cue);
s.nstrips = s.strips.size(); s.nstrips = s.strips.size();
_surface.push_back (s); _surface.push_back (s);
} }
@@ -3699,7 +3700,7 @@ struct StripableByPresentationOrder
}; };
OSC::Sorted OSC::Sorted
OSC::get_sorted_stripables(std::bitset<32> types) OSC::get_sorted_stripables(std::bitset<32> types, bool cue)
{ {
Sorted sorted; Sorted sorted;
@@ -3712,7 +3713,7 @@ OSC::get_sorted_stripables(std::bitset<32> types)
for (StripableList::iterator it = stripables.begin(); it != stripables.end(); ++it) { for (StripableList::iterator it = stripables.begin(); it != stripables.end(); ++it) {
boost::shared_ptr<Stripable> s = *it; boost::shared_ptr<Stripable> s = *it;
if ((!types[9]) && (s->presentation_info().flags() & PresentationInfo::Hidden)) { if ((!cue) && (!types[9]) && (s->presentation_info().flags() & PresentationInfo::Hidden)) {
// do nothing... skip it // do nothing... skip it
} else { } else {
@@ -3831,7 +3832,7 @@ OSC::_cue_set (uint32_t aux, lo_address addr)
s->gainmode = 1; s->gainmode = 1;
s->cue = true; s->cue = true;
s->aux = aux; s->aux = aux;
s->strips = get_sorted_stripables(s->strip_types); s->strips = get_sorted_stripables(s->strip_types, s->cue);
s->nstrips = s->strips.size(); s->nstrips = s->strips.size();
// get rid of any old CueObsevers for this address // get rid of any old CueObsevers for this address

2
libs/surfaces/osc/osc.h
View File

@@ -96,7 +96,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
}; };
typedef std::vector<boost::shared_ptr<ARDOUR::Stripable> > Sorted; typedef std::vector<boost::shared_ptr<ARDOUR::Stripable> > Sorted;
Sorted get_sorted_stripables(std::bitset<32> types); Sorted get_sorted_stripables(std::bitset<32> types, bool cue);
// keep a surface's global setup by remote server url // keep a surface's global setup by remote server url
struct OSCSurface { struct OSCSurface {