ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

utils: re-implement used_channels_as_string to use UsedChannels (bitset)

This commit is contained in:
Ben Loftis 2022-02-24 14:30:54 -06:00
parent eced764480
commit 849526b7e7
2 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
gtk2_ardour/utils.cc
View File

@ -804,46 +804,45 @@ ARDOUR_UI_UTILS::samples_as_time_string (samplecnt_t s, float rate, bool show_sa
}
string
ARDOUR_UI_UTILS::midi_channels_as_string (std::set<uint8_t> const& channels)
ARDOUR_UI_UTILS::midi_channels_as_string (std::bitset<16> channels)
{
if (channels.empty ()) {
if (channels.none ()) {
return _("none");
}
string rv;
auto i = channels.begin ();
uint8_t next = *i;
uint8_t prev = next;
rv += to_string<int> (next + 1);
for (int i = 0; i<16; i++) {
do {
if (*i == next) {
++i;
++next;
if (i != channels.end ()) {
continue;
bool prior = i<1 ? false : channels.test(i-1);
bool current = channels.test(i);
bool next = i>14 ? false : channels.test(i+1);
bool nextnext = i>13 ? false : channels.test(i+2);
bool future = false;
for (int f = i+1; f<16; f++) {
if (channels.test(f)) {
future = true;
}
}
if (next - prev > 2) {
rv += "-";
rv += to_string<int> (next);
} else if (next - prev > 1) {
rv += ", ";
rv += to_string<int> (next);
if (prior && current && next) {
/* I'm in the middle of a consecutive chain, maybe just add a dash */
if (!rv.empty() && (rv.rfind("-") != rv.length()-1 )) {
rv += "-";
}
continue;
}
if (i == channels.end ()) {
break;
if (current) {
/* here I am! */
rv+=to_string<int> (i+1);
}
rv += ", ";
rv += to_string<int> (*i + 1);
prev = *i;
next = prev + 1;
++i;
} while (i != channels.end ());
if (current && future && !(next && nextnext)) {
/* there are channels after me but they are not 3 consecutive; add a comma */
rv += ",";
}
}
return rv;
}

2
gtk2_ardour/utils.h
View File

@ -109,7 +109,7 @@ Gdk::Color unique_random_color (std::list<Gdk::Color> &);
std::string rate_as_string (float r);
std::string samples_as_time_string (ARDOUR::samplecnt_t s, float r, bool show_samples = false);
std::string midi_channels_as_string (std::set<uint8_t> const&);
std::string midi_channels_as_string (std::bitset<16>);
bool windows_overlap (Gtk::Window *a, Gtk::Window *b);