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

FP8: fix 2-line text

Browse Source
This commit is contained in:
Robin Gareus
2017-07-02 01:57:21 +02:00
parent b2f3523ab6
commit d1d6e696aa
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libs/surfaces/faderport8/fp8_strip.cc
View File

@@ -274,10 +274,10 @@ FP8Strip::set_stripable (boost::shared_ptr<Stripable> s, bool panmode)
_stripable_name = s->name ();
if (_base.twolinetext ()) {
set_strip_name ();
} else {
set_text_line (0, s->name ());
set_text_line (1, _pan_ctrl ? _pan_ctrl->get_user_string () : "");
} else {
set_strip_name ();
}
set_text_line (2, "");
set_text_line (3, "");
@@ -544,6 +544,9 @@ FP8Strip::periodic_update_meter ()
set_text_line (2, "");
}
}
else if (_displaymode == PluginSelect) {
set_bar_mode (4); // Off
}
else if (_displaymode == SendDisplay) {
set_bar_mode (4); // Off
if (_fader_ctrl) {
@@ -561,16 +564,16 @@ FP8Strip::periodic_update_meter ()
_last_barpos = val;
}
if (_base.twolinetext ()) {
set_text_line (1, _pan_ctrl->get_user_string ());
} else {
set_strip_name ();
} else {
set_text_line (1, _pan_ctrl->get_user_string ());
}
} else {
set_bar_mode (4); // Off
if (_base.twolinetext ()) {
set_text_line (1, "");
} else {
set_strip_name ();
} else {
set_text_line (1, "");
}
}