diff options
| author | Len Ovens <len@ovenwerks.net> | 2018-03-20 14:37:08 -0700 |
|---|---|---|
| committer | Len Ovens <len@ovenwerks.net> | 2018-03-20 14:37:40 -0700 |
| commit | c177434669dc88a65e707f4b2eac23238e005281 (patch) | |
| tree | d5374f9d4b07e972bf6d49db1f12a5f546f8db39 /libs/surfaces/osc/osc.h | |
| parent | cbb039b9f65a8b179c34f8b930a3cb0ea31cd24e (diff) | |
OSC: Change custom mode to enum
Diffstat (limited to 'libs/surfaces/osc/osc.h')
| -rw-r--r-- | libs/surfaces/osc/osc.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h index 66d79c16ca..f7284063f5 100644 --- a/libs/surfaces/osc/osc.h +++ b/libs/surfaces/osc/osc.h @@ -109,6 +109,17 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest> All }; + enum OSCCustomMode { + CusOff = 0, + CusRawOrder = 1, + CusSort =2, + CusFilterRaw = 5, + CusFilter = 6, + GroupOnly = 7, + VCAOnly = 8, + BusOnly = 9 + }; + typedef std::vector<boost::shared_ptr<ARDOUR::Stripable> > Sorted; Sorted get_sorted_stripables(std::bitset<32> types, bool cue, uint32_t custom, Sorted my_list); typedef std::map<boost::shared_ptr<ARDOUR::AutomationControl>, uint32_t> FakeTouchMap; @@ -127,7 +138,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest> int gainmode; // what kind of faders do we have Gain db or position 0 to 1? PBD::Controllable::GroupControlDisposition usegroup; // current group disposition Sorted custom_strips; // a sorted list of user selected strips - uint32_t custom_mode; // use custom strip list + OSCCustomMode custom_mode; // use custom strip list Sorted temp_strips; // temp strip list for grouponly, vcaonly, auxonly Sorted strips; // list of stripables for this surface // strips @@ -191,7 +202,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest> bool autobank; // banksize is derived from total uint32_t not_ready; // number of 1st device, 0 = ready Sorted custom_strips; // a sorted list of user selected strips - uint32_t custom_mode; // use custom strip list + OSCCustomMode custom_mode; // use custom strip list Sorted temp_strips; // temp strip list for grouponly, vcaonly, auxonly std::bitset<32> strip_types; // strip_types for this linkset Sorted strips; // list of valid strips in order for this set @@ -692,7 +703,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest> int refresh_surface (lo_message msg); int custom_clear (lo_message msg); int custom_mode (float state, lo_message msg); - int _custom_mode (uint32_t state, lo_address addr); + int _custom_mode (OSCCustomMode state, lo_address addr); int name_session (char *n, lo_message msg); // select int sel_send_pagesize (uint32_t size, lo_message msg); |