diff options
| author | Robin Gareus <robin@gareus.org> | 2017-07-02 01:57:21 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-07-02 01:57:21 +0200 |
| commit | d1d6e696aa840261e090d15f282096cf7592fc0a (patch) | |
| tree | 5962cefc7b3711def139330524c5743a7a6cd82f /libs | |
| parent | b2f3523ab621cb9b1dc30505411c11b54feb7c76 (diff) | |
FP8: fix 2-line text
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/surfaces/faderport8/fp8_strip.cc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libs/surfaces/faderport8/fp8_strip.cc b/libs/surfaces/faderport8/fp8_strip.cc index 3a5b97a1e2..39aeb4b2f2 100644 --- a/libs/surfaces/faderport8/fp8_strip.cc +++ b/libs/surfaces/faderport8/fp8_strip.cc @@ -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, ""); } } |