diff options
| author | Len Ovens <len@ovenwerks.net> | 2016-11-04 12:10:37 -0700 |
|---|---|---|
| committer | Len Ovens <len@ovenwerks.net> | 2016-11-04 12:10:37 -0700 |
| commit | 91c2527f5c347bc303575619821edad44c07dfa4 (patch) | |
| tree | da789a5879ffb6418fba8304dbcaa3c1bcab15dd /libs/surfaces | |
| parent | 1457050d7aa2f5e0bee1957ff3710f58c04a2c62 (diff) | |
OSC: Fix default strip types to include Auxes.
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/osc/osc.cc | 6 | ||||
| -rw-r--r-- | libs/surfaces/osc/osc_gui.cc | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index 4c56a239c6..4a0e8657d0 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -94,7 +94,7 @@ OSC::OSC (Session& s, uint32_t port) , address_only (false) , remote_port ("8000") , default_banksize (0) - , default_strip (31) + , default_strip (159) , default_feedback (0) , default_gainmode (0) , tick (true) @@ -1370,7 +1370,7 @@ OSC::get_surface (lo_address addr) s.remote_url = r_url; s.bank = 1; s.bank_size = default_banksize; // need to find out how many strips there are - s.strip_types = default_strip; // 31 is tracks, busses, and VCAs (no master/monitor) + s.strip_types = default_strip; // 159 is tracks, busses, and VCAs (no master/monitor) s.feedback = default_feedback; s.gainmode = default_gainmode; s.sel_obs = 0; @@ -3374,8 +3374,6 @@ OSC::get_sorted_stripables(std::bitset<32> types) if (types[1] && (s->presentation_info().flags() & PresentationInfo::MidiTrack)) { sorted.push_back (s); } else -/* if (types[2] && (s->presentation_info().flags() & PresentationInfo::AudioBus)) { - sorted.push_back (s); */ if ((s->presentation_info().flags() & PresentationInfo::AudioBus)) { boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s); // r->feeds (session->master_out()) may make more sense diff --git a/libs/surfaces/osc/osc_gui.cc b/libs/surfaces/osc/osc_gui.cc index 9b1c29a3ad..74bf849868 100644 --- a/libs/surfaces/osc/osc_gui.cc +++ b/libs/surfaces/osc/osc_gui.cc @@ -558,7 +558,7 @@ OSC_GUI::factory_reset () { cp.set_banksize (0); bank_entry.set_value (0); - cp.set_defaultstrip (31); + cp.set_defaultstrip (159); cp.set_defaultfeedback (0); reshow_values (); cp.set_gainmode (0); @@ -581,6 +581,7 @@ OSC_GUI::reshow_values () control_masters.set_active(def_strip & 16); master_type.set_active(def_strip & 32); monitor_type.set_active(def_strip & 64); + audio_auxes.set_active(def_strip & 128); selected_tracks.set_active(def_strip & 256); hidden_tracks.set_active(def_strip & 512); def_feedback = cp.get_defaultfeedback(); |