summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2014-09-06 12:48:47 +0200
committerRobin Gareus <robin@gareus.org>2014-09-06 12:48:47 +0200
commit089184c016cc7ff34a888b78f6af55765ef0b8b0 (patch)
tree0dbb92a317078c84fe1978ee2afc2a183271fc05
parentaa769c90960070a7754e23524e9569bfaa196574 (diff)
fix mixer strip track number display (amend 4a00bdf0)
-rw-r--r--gtk2_ardour/mixer_strip.cc33
1 files changed, 17 insertions, 16 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 285e3e9876..ceb6e08dd2 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -1586,25 +1586,26 @@ void
MixerStrip::name_changed ()
{
switch (_width) {
- case Wide:
- if (_session->config.get_track_name_number()) {
- const int64_t track_number = _route->track_number ();
- if (track_number == 0) {
- number_label.set_text ("-");
- } else {
- number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec));
- }
- } else {
- number_label.set_text ("");
- }
- name_button.set_text (_route->name());
- break;
- case Narrow:
- name_button.set_text (PBD::short_version (_route->name(), 5));
- break;
+ case Wide:
+ name_button.set_text (_route->name());
+ break;
+ case Narrow:
+ name_button.set_text (PBD::short_version (_route->name(), 5));
+ break;
}
ARDOUR_UI::instance()->set_tip (name_button, _route->name());
+
+ if (_session->config.get_track_name_number()) {
+ const int64_t track_number = _route->track_number ();
+ if (track_number == 0) {
+ number_label.set_text ("-");
+ } else {
+ number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec));
+ }
+ } else {
+ number_label.set_text ("");
+ }
}
void