various fixes and changes

2 files changed, 10 insertions, 2 deletions

diff --git a/muse2/muse/mixer/astrip.cpp b/muse2/muse/mixer/astrip.cpp
index a75968a1..530ca7e2 100644
--- a/muse2/muse/mixer/astrip.cpp
+++ b/muse2/muse/mixer/astrip.cpp
@@ -821,7 +821,11 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at)
             for (int idx = 0; idx < auxsSize; ++idx) {
                   MusEGui::DoubleLabel* al; // the thought was to aquire the correct Aux name for each Aux
                                             // now they are only called Aux1, Aux2, which isn't too usable.
-                  QLabel *name = new QLabel(((MusECore::Track*)(MusEGlobal::song->auxs()->at(idx)))->name(),this);
+                  QString title = ((MusECore::AudioAux*)(MusEGlobal::song->auxs()->at(idx)))->auxName();
+                  if (title.length() > 8) { // shorten name
+                      title = title.mid(0,8) + ".";
+                  }
+                  QLabel *name = new QLabel(title,this);
                   MusEGui::Knob* ak = addKnob(1, idx, &al, name);
 
                   auxKnob.push_back(ak);
diff --git a/muse2/muse/mixer/strip.cpp b/muse2/muse/mixer/strip.cpp
index f34d5320..06ee9443 100644
--- a/muse2/muse/mixer/strip.cpp
+++ b/muse2/muse/mixer/strip.cpp
@@ -159,7 +159,11 @@ void Strip::setLabelText()
                   return;      
             }
       
-      label->setText(track->name());
+      if (track->type() == MusECore::Track::AUDIO_AUX) {
+          label->setText(((MusECore::AudioAux*)track)->auxName());
+      } else {
+          label->setText(track->name());
+      }
       QPalette palette;
       //palette.setColor(label->backgroundRole(), c);
       QLinearGradient gradient(label->geometry().topLeft(), label->geometry().bottomLeft());